refactor: Refactor PostgreSQL config inclusion and paths

- Update Dockerfiles to standardize `unix_socket_directories`.
- Introduce `include_dir` in `postgresql.conf.j2` to manage configurations within `/etc/postgresql-custom/conf.d/`.
- Migrate generated optimizations and custom overrides to the new `conf.d` directory.
- Adjust service files (`database-optimizations.service`, `postgres_prestart.sh`) and Ansible tasks to reference the updated configuration paths.

Author: hunleyd

Dockerfile-15

@@ -218,7 +218,6 @@ COPY --chown=postgres:postgres ansible/files/walg_helper_scripts/wal_fetch.sh /h
 COPY ansible/files/walg_helper_scripts/wal_change_ownership.sh /root/wal_change_ownership.sh
 
 RUN sed -i \
-    -e "s|#unix_socket_directories = '/tmp'|unix_socket_directories = '/var/run/postgresql'|g" \
     -e "s|#session_preload_libraries = ''|session_preload_libraries = 'supautils'|g" \
     -e "s|#include = '/etc/postgresql-custom/supautils.conf'|include = '/etc/postgresql-custom/supautils.conf'|g" \
     /etc/postgresql/postgresql.conf && \

Dockerfile-17

@@ -222,7 +222,6 @@ COPY --chown=postgres:postgres ansible/files/walg_helper_scripts/wal_fetch.sh /h
 COPY ansible/files/walg_helper_scripts/wal_change_ownership.sh /root/wal_change_ownership.sh
 
 RUN sed -i \
-    -e "s|#unix_socket_directories = '/tmp'|unix_socket_directories = '/var/run/postgresql'|g" \
     -e "s|#session_preload_libraries = ''|session_preload_libraries = 'supautils'|g" \
     -e "s|#include = '/etc/postgresql-custom/supautils.conf'|include = '/etc/postgresql-custom/supautils.conf'|g" \
     /etc/postgresql/postgresql.conf && \

Dockerfile-orioledb-17

@@ -222,7 +222,6 @@ COPY --chown=postgres:postgres ansible/files/walg_helper_scripts/wal_fetch.sh /h
 COPY ansible/files/walg_helper_scripts/wal_change_ownership.sh /root/wal_change_ownership.sh
 
 RUN sed -i \
-    -e "s|#unix_socket_directories = '/tmp'|unix_socket_directories = '/var/run/postgresql'|g" \
     -e "s|#session_preload_libraries = ''|session_preload_libraries = 'supautils'|g" \
     -e "s|#include = '/etc/postgresql-custom/supautils.conf'|include = '/etc/postgresql-custom/supautils.conf'|g" \
     /etc/postgresql/postgresql.conf && \

…/files/database-optimizations.service.j2 …ble/files/database_optimizations.serviceansible/files/database-optimizations.service.j2 renamed to ansible/files/database_optimizations.service ansible/files/database-optimizations.service.j2 renamed to ansible/files/database_optimizations.service

@@ -4,7 +4,7 @@ Description=Postgresql optimizations
 [Service]
 Type=oneshot
 # we do not want failures from these commands to cause downstream service startup to fail
-ExecStart=-/opt/supabase-admin-api optimize db --destination-config-file-path /etc/postgresql-custom/generated-optimizations.conf
+ExecStart=-/opt/supabase-admin-api optimize db --destination-config-file-path /etc/postgresql-custom/conf.d/generated_optimizations.conf
 ExecStart=-/opt/supabase-admin-api optimize pgbouncer --destination-config-file-path /etc/pgbouncer-custom/generated-optimizations.ini
 User=adminapi
 

ansible/files/postgres_prestart.sh.j2

@@ -15,7 +15,7 @@ check_orioledb_enabled() {
 }
 
 get_shared_buffers() {
-    local opt_conf="/etc/postgresql-custom/generated-optimizations.conf"
+    local opt_conf="/etc/postgresql-custom/conf.d/generated_optimizations.conf"
     if [ ! -f "$opt_conf" ]; then
         return 0
     fi
@@ -134,4 +134,4 @@ if [ $(locale -a | grep -c en_US.utf8) -eq 0 ]; then
    locale-gen
 fi
 
-main
+main

ansible/files/postgresql_config/conf.d/custom_overrides.conf

@@ -64,7 +64,7 @@ listen_addresses = '*'		# what IP address(es) to listen on;
 #port = 5432				# (change requires restart)
 #max_connections = 100			# (change requires restart)
 #superuser_reserved_connections = 3	# (change requires restart)
-#unix_socket_directories = '/tmp'	# comma-separated list of directories
+unix_socket_directories = '/var/run/postgresql'	# comma-separated list of directories
 					# (change requires restart)
 #unix_socket_group = ''			# (change requires restart)
 #unix_socket_permissions = 0777		# begin with 0 to use octal notation
@@ -752,11 +752,6 @@ jit_provider = 'llvmjit'		# JIT library to use
 #include_if_exists = '...'		# include file only if it exists
 #include = '...'			# include file
 
-# Automatically generated optimizations
-#include = '/etc/postgresql-custom/generated-optimizations.conf'
-# User-supplied custom parameters, override any automatically generated ones
-#include = '/etc/postgresql-custom/custom-overrides.conf'
-
 # supautils specific configurations
 #include = '/etc/postgresql-custom/supautils.conf'
 

ansible/files/postgresql_config/conf.d/generated_optimizations.conf

@@ -147,11 +147,11 @@
         group: 'postgres'
         mode: '0664'
         owner: 'postgres'
-        path: "/etc/postgresql-custom/{{ pg_config_item }}"
+        path: "/etc/postgresql-custom/conf.d{{ pg_config_item }}"
         state: 'touch'
       loop:
-        - 'custom-overrides.conf'
-        - 'generated-optimizations.conf'
+        - 'custom_overrides.conf'
+        - 'generated_optimizations.conf'
       loop_control:
         loop_var: 'pg_config_item'
 

ansible/files/postgresql_config/postgresql.conf.j2

@@ -75,20 +75,6 @@
     state: 'directory'
   become: true
 
-- name: Include file for generated optimizations in postgresql.conf
-  ansible.builtin.replace:
-    path: '/etc/postgresql/postgresql.conf'
-    regexp: "#include = '/etc/postgresql-custom/generated-optimizations.conf'"
-    replace: "include = '/etc/postgresql-custom/generated-optimizations.conf'"
-  become: true
-
-- name: Include file for custom overrides in postgresql.conf
-  ansible.builtin.replace:
-    path: '/etc/postgresql/postgresql.conf'
-    regexp: "#include = '/etc/postgresql-custom/custom-overrides.conf'"
-    replace: "include = '/etc/postgresql-custom/custom-overrides.conf'"
-  become: true
-
 - name: Install Postgres exporter
   ansible.builtin.import_tasks:
     file: internal/postgres-exporter.yml