fix: postgres bin directory location for pgsodium extension when running a docker build (supabase#147)

bhvngt · web-flow · commit 37ac0a91b6fb · 2022-03-23T18:13:17.000+08:00
diff --git a/ansible/files/postgresql_config/postgresql.conf.j2 b/ansible/files/postgresql_config/postgresql.conf.j2
@@ -723,8 +723,7 @@ shared_preload_libraries = 'pg_stat_statements, pgaudit, plpgsql, plpgsql_check,
 jit_provider = 'llvmjit'		# JIT library to use
 
 # - Other Defaults -
-
-pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey_urandom.sh'
+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,8 +27,14 @@
 - set_fact:
     platform: "{{ platform_output.stdout }}"
 
+- name: pgsodium - store postgres bin directory
+  shell: pg_config --bindir
+  register: pg_bindir_output
+- set_fact: 
+    pg_bindir: "{{ pg_bindir_output.stdout }}"
+
 - name: Setup - import postgresql.conf
-  synchronize:
+  template:
     src: files/postgresql_config/postgresql.conf.j2
     dest: /etc/postgresql/postgresql.conf
 
diff --git a/ansible/tasks/postgres-extensions/18-pgsodium.yml b/ansible/tasks/postgres-extensions/18-pgsodium.yml
@@ -59,7 +59,7 @@
 - name: import pgsodium_getkey_urandom.sh
   template:
     src: files/pgsodium_getkey_urandom.sh.j2
-    dest: /usr/lib/postgresql/bin/pgsodium_getkey_urandom.sh
+    dest: "{{ pg_bindir }}/pgsodium_getkey_urandom.sh"
     owner: postgres
     group: postgres
     mode: 0700
