ensure bindir when installing pgsodium works for EC2 builds

dragarcia · darora · commit c4d0cfc0c45c · 2022-03-24T14:11:46.000+01:00
diff --git a/ansible/files/postgresql_config/postgresql.conf.j2 b/ansible/files/postgresql_config/postgresql.conf.j2
@@ -723,7 +723,6 @@ shared_preload_libraries = 'pg_stat_statements, pgaudit, plpgsql, plpgsql_check,
 jit_provider = 'llvmjit'		# JIT library to use
 
 # - Other Defaults -
-pgsodium.getkey_script= '{{ pg_bindir }}/pgsodium_getkey_urandom.sh'
 
 #dynamic_library_path = '$libdir'
 #gin_fuzzy_search_limit = 0
diff --git a/ansible/tasks/docker/setup.yml b/ansible/tasks/docker/setup.yml
@@ -27,7 +27,7 @@
 - set_fact:
     platform: "{{ platform_output.stdout }}"
 
-- name: pgsodium - store postgres bin directory
+- name: Setup - determine postgres bin directory
   shell: pg_config --bindir
   register: pg_bindir_output
 - set_fact: 
diff --git a/ansible/tasks/postgres-extensions/18-pgsodium.yml b/ansible/tasks/postgres-extensions/18-pgsodium.yml
@@ -64,3 +64,9 @@
     group: postgres
     mode: 0700
 
+- name: pgsodium - set pgsodium.getkey_script
+  become: yes
+  lineinfile:
+    path: /etc/postgresql/postgresql.conf
+    state: present
+    line: pgsodium.getkey_script= '{{ pg_bindir }}/pgsodium_getkey_urandom.sh'
diff --git a/ansible/tasks/setup-system.yml b/ansible/tasks/setup-system.yml
@@ -62,6 +62,12 @@
     - update
     - update-only
 
+- name: determine postgres bin directory
+  shell: pg_config --bindir
+  register: pg_bindir_output
+- set_fact: 
+    pg_bindir: "{{ pg_bindir_output.stdout }}"
+
 - name: System - Create services.slice
   template:
     src: files/services.slice.j2
