Skip to content

Commit 5717efd

Browse files
committed
fix: resolving merge conflict
1 parent e18c74f commit 5717efd

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

ansible/tasks/setup-docker.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
src: files/extensions/
44
dest: /tmp/extensions/
55
when: debpkg_mode
6+
67
# Builtin apt module does not support wildcard for deb paths
78
- name: Install extensions
89
shell: |
@@ -24,7 +25,7 @@
2425
register: pg_bindir_output
2526
- set_fact:
2627
pg_bindir: "{{ pg_bindir_output.stdout }}"
27-
when: debpkg_mode
28+
when: debpkg_mode or nixpkg_mode and stage2_nix
2829

2930
- name: pgsodium - set pgsodium.getkey_script
3031
become: yes

0 commit comments

Comments
 (0)