refactor(PG-configuration): move includes to conf.d and rename wth the numeric prefixes as per Sam

hunleyd · hunleyd · commit 161cd9013056 · 2025-10-14T15:45:37.000-04:00
diff --git a/Dockerfile-15 b/Dockerfile-15
@@ -158,14 +158,9 @@ COPY --from=walg /tmp/wal-g /usr/local/bin/
 COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql.conf.j2 /etc/postgresql/postgresql.conf
 COPY --chown=postgres:postgres ansible/files/postgresql_config/pg_hba.conf.j2 /etc/postgresql/pg_hba.conf
 COPY --chown=postgres:postgres ansible/files/postgresql_config/pg_ident.conf.j2 /etc/postgresql/pg_ident.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql-stdout-log.conf /etc/postgresql-custom/00-logging.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/autoexplain.conf /etc/postgresql-custom/auto_explain.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/pgcron.conf /etc/postgresql-custom/pg_cron.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/supautils.conf.j2 /etc/postgresql-custom/05-supautils.conf
+COPY --chown=postgres:postgres ansible/files/postgresql_config/conf.d /etc/postgresql-custom/
 COPY --chown=postgres:postgres ansible/files/postgresql_extension_custom_scripts /etc/postgresql-custom/extension-custom-scripts
 COPY --chown=postgres:postgres ansible/files/pgsodium_getkey_urandom.sh.j2 /usr/lib/postgresql/bin/pgsodium_getkey.sh
-COPY --chown=postgres:postgres ansible/files/postgresql_config/custom_read_replica.conf.j2 /etc/postgresql-custom/04-read-replica.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/custom_walg.conf.j2 /etc/postgresql-custom/03-wal-g.conf
 COPY --chown=postgres:postgres ansible/files/walg_helper_scripts/wal_fetch.sh /home/postgres/wal_fetch.sh
 COPY ansible/files/walg_helper_scripts/wal_change_ownership.sh /root/wal_change_ownership.sh
 
diff --git a/Dockerfile-17 b/Dockerfile-17
@@ -162,14 +162,9 @@ COPY --from=walg /tmp/wal-g /usr/local/bin/
 COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql.conf.j2 /etc/postgresql/postgresql.conf
 COPY --chown=postgres:postgres ansible/files/postgresql_config/pg_hba.conf.j2 /etc/postgresql/pg_hba.conf
 COPY --chown=postgres:postgres ansible/files/postgresql_config/pg_ident.conf.j2 /etc/postgresql/pg_ident.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql-stdout-log.conf /etc/postgresql-custom/00-logging.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/autoexplain.conf /etc/postgresql-custom/auto_explain.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/pgcron.conf /etc/postgresql-custom/pg_cron.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/supautils.conf.j2 /etc/postgresql-custom/05-supautils.conf
+COPY --chown=postgres:postgres ansible/files/postgresql_config/conf.d /etc/postgresql-custom/
 COPY --chown=postgres:postgres ansible/files/postgresql_extension_custom_scripts /etc/postgresql-custom/extension-custom-scripts
 COPY --chown=postgres:postgres ansible/files/pgsodium_getkey_urandom.sh.j2 /usr/lib/postgresql/bin/pgsodium_getkey.sh
-COPY --chown=postgres:postgres ansible/files/postgresql_config/custom_read_replica.conf.j2 /etc/postgresql-custom/04-read-replica.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/custom_walg.conf.j2 /etc/postgresql-custom/03-wal-g.conf
 COPY --chown=postgres:postgres ansible/files/walg_helper_scripts/wal_fetch.sh /home/postgres/wal_fetch.sh
 COPY ansible/files/walg_helper_scripts/wal_change_ownership.sh /root/wal_change_ownership.sh
 
diff --git a/Dockerfile-orioledb-17 b/Dockerfile-orioledb-17
@@ -162,14 +162,9 @@ COPY --from=walg /tmp/wal-g /usr/local/bin/
 COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql.conf.j2 /etc/postgresql/postgresql.conf
 COPY --chown=postgres:postgres ansible/files/postgresql_config/pg_hba.conf.j2 /etc/postgresql/pg_hba.conf
 COPY --chown=postgres:postgres ansible/files/postgresql_config/pg_ident.conf.j2 /etc/postgresql/pg_ident.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql-stdout-log.conf /etc/postgresql-custom/00-logging.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/autoexplain.conf /etc/postgresql-custom/auto_explain.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/pgcron.conf /etc/postgresql-custom/pg_cron.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/supautils.conf.j2 /etc/postgresql-custom/05-supautils.conf
+COPY --chown=postgres:postgres ansible/files/postgresql_config/conf.d /etc/postgresql-custom/
 COPY --chown=postgres:postgres ansible/files/postgresql_extension_custom_scripts /etc/postgresql-custom/extension-custom-scripts
 COPY --chown=postgres:postgres ansible/files/pgsodium_getkey_urandom.sh.j2 /usr/lib/postgresql/bin/pgsodium_getkey.sh
-COPY --chown=postgres:postgres ansible/files/postgresql_config/custom_read_replica.conf.j2 /etc/postgresql-custom/04-read-replica.conf
-COPY --chown=postgres:postgres ansible/files/postgresql_config/custom_walg.conf.j2 /etc/postgresql-custom/03-wal-g.conf
 COPY --chown=postgres:postgres ansible/files/walg_helper_scripts/wal_fetch.sh /home/postgres/wal_fetch.sh
 COPY ansible/files/walg_helper_scripts/wal_change_ownership.sh /root/wal_change_ownership.sh
 
diff --git a/ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh b/ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh
@@ -515,11 +515,11 @@ EOF
     mkdir -p "$MOUNT_POINT/conf"
     cp -R /etc/postgresql-custom/* "$MOUNT_POINT/conf/"
     # removing supautils config as to allow the latest one provided by the latest image to be used
-    rm -f "$MOUNT_POINT/conf/05-supautils.conf" || true
+    rm -f "$MOUNT_POINT/conf/conf.d/05-supautils.conf" || true
     rm -rf "$MOUNT_POINT/conf/extension-custom-scripts" || true
 
     # removing wal-g config as to allow it to be explicitly enabled on the new instance
-    rm -f "$MOUNT_POINT/conf/wal-g.conf"
+    rm -f "$MOUNT_POINT/conf/conf.d/03-wal-g.conf"
 
     # copy sql files generated by pg_upgrade
     echo "12. Copying sql files generated by pg_upgrade"
diff --git a/ansible/files/database-optimizations.service.j2 b/ansible/files/database-optimizations.service.j2
@@ -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/01-generated-optimizations.conf
+ExecStart=-/opt/supabase-admin-api optimize db --destination-config-file-path /etc/postgresql-custom/conf.d/01-generated-optimizations.conf
 ExecStart=-/opt/supabase-admin-api optimize pgbouncer --destination-config-file-path /etc/pgbouncer-custom/generated-optimizations.ini
 User=adminapi
 
diff --git a/ansible/files/postgres_prestart.sh.j2 b/ansible/files/postgres_prestart.sh.j2
@@ -15,7 +15,7 @@ check_orioledb_enabled() {
 }
 
 get_shared_buffers() {
-    local opt_conf="/etc/postgresql-custom/01-generated-optimizations.conf"
+    local opt_conf="/etc/postgresql-custom/conf.d/01-generated-optimizations.conf"
     if [ ! -f "$opt_conf" ]; then
         return 0
     fi
diff --git a/ansible/files/postgresql_config/conf.d/00-logging.conf b/ansible/files/postgresql_config/conf.d/00-logging.conf
diff --git a/ansible/files/postgresql_config/conf.d/03-wal-g.conf b/ansible/files/postgresql_config/conf.d/03-wal-g.conf
diff --git a/ansible/files/postgresql_config/conf.d/04-read-replica.conf b/ansible/files/postgresql_config/conf.d/04-read-replica.conf
diff --git a/ansible/files/postgresql_config/conf.d/05-supautils.conf b/ansible/files/postgresql_config/conf.d/05-supautils.conf
diff --git a/ansible/files/postgresql_config/conf.d/autoexplain.conf b/ansible/files/postgresql_config/conf.d/autoexplain.conf
diff --git a/ansible/files/postgresql_config/conf.d/pgcron.conf b/ansible/files/postgresql_config/conf.d/pgcron.conf
diff --git a/ansible/files/postgresql_config/postgresql.conf.j2 b/ansible/files/postgresql_config/postgresql.conf.j2
@@ -158,4 +158,5 @@ jit_provider = 'llvmjit'		# JIT library to use
 # default postgresql.conf.  Note that these are directives, not variable
 # assignments, so they can usefully be given more than once.
 
-include_dir = '/etc/postgresql-custom'			# include files ending in '.conf' from a directory, e.g., 'conf.d'
+# include files ending in '.conf' from a directory, e.g., 'conf.d'
+include_dir = '/etc/postgresql-custom/conf.d'
diff --git a/ansible/tasks/finalize-ami.yml b/ansible/tasks/finalize-ami.yml
@@ -1,14 +1,14 @@
 - name: PG logging conf
-  ansible.builtin.template:
-    dest: '/etc/postgresql-custom/00-logging.conf'
+  ansible.builtin.copy:
+    dest: '/etc/postgresql-custom/conf.d/00-logging.conf'
     group: 'postgres'
     src: 'files/postgresql_config/postgresql-csvlog.conf'
 
 - name: auto_explain and pg_cron confs
   ansible.builtin.template:
-    dest: "/etc/postgresql-custom/{{ ext_item }}.conf"
+    dest: "/etc/postgresql-custom/conf.d/{{ ext_item }}.conf"
     group: 'postgres'
-    src: "files/postgresql_config/{{ ext_item | split('_') | join('') }}.conf"
+    src: "files/postgresql_config/conf.d/{{ ext_item | split('_') | join('') }}.conf"
   loop:
     - auto_explain
     - pg_cron
diff --git a/ansible/tasks/internal/supautils.yml b/ansible/tasks/internal/supautils.yml
@@ -33,9 +33,9 @@
   become: yes
 
 - name: supautils - write custom 05-supautils.conf
-  template:
-    src: "files/postgresql_config/supautils.conf.j2"
-    dest: /etc/postgresql-custom/05-supautils.conf
+  copy:
+    src: "files/postgresql_config/conf.d/05-supautils.conf"
+    dest: /etc/postgresql-custom/conf.d/05-supautils.conf
     mode: 0664
     owner: postgres
     group: postgres
diff --git a/ansible/tasks/setup-docker.yml b/ansible/tasks/setup-docker.yml
@@ -43,12 +43,12 @@
   block:
     # supautils
     - name: supautils - write custom supautils.conf
-      ansible.builtin.template:
-        dest: '/etc/postgresql-custom/05-supautils.conf'
+      ansible.builtin.copy:
+        dest: '/etc/postgresql-custom/conf.d/05-supautils.conf'
         mode: '0664'
         group: 'postgres'
         owner: 'postgres'
-        src: 'files/postgresql_config/supautils.conf.j2'
+        src: 'files/postgresql_config/conf.d/supautils.conf'
 
     - name: supautils - copy extension custom scripts
       ansible.builtin.copy:
diff --git a/ansible/tasks/setup-postgres.yml b/ansible/tasks/setup-postgres.yml
@@ -157,9 +157,9 @@
 
 # Add custom config for read replicas set up
 - name: Move custom read-replica.conf file to /etc/postgresql-custom/04-read-replica.conf
-  template:
-    src: "files/postgresql_config/custom_read_replica.conf.j2"
-    dest: /etc/postgresql-custom/04-read-replica.conf
+  copy:
+    src: "files/postgresql_config/conf.d/04-custom_read_replica.conf"
+    dest: /etc/postgresql-custom/conf.d/04-read-replica.conf
     mode: 0664
     owner: postgres
     group: postgres
diff --git a/ansible/tasks/setup-wal-g.yml b/ansible/tasks/setup-wal-g.yml
@@ -60,10 +60,10 @@
     mode: '0664'
   when: stage2_nix
 
-- name: Move custom wal-g.conf file to /etc/postgresql-custom/03-wal-g.conf
-  template:
-    src: "files/postgresql_config/custom_walg.conf.j2"
-    dest: /etc/postgresql-custom/03-wal-g.conf
+- name: Move custom wal-g.conf file to /etc/postgresql-custom/conf.d/03-wal-g.conf
+  copy:
+    src: "files/postgresql_config/conf.d/03-custom_walg.conf"
+    dest: /etc/postgresql-custom/conf.d/03-wal-g.conf
     mode: 0664
     owner: postgres
     group: postgres
diff --git a/ansible/tasks/stage2-setup-postgres.yml b/ansible/tasks/stage2-setup-postgres.yml
@@ -30,7 +30,7 @@
       ansible.builtin.command:
         cmd: >
           sed -i 's/ timescaledb,//g; s/ plv8,//g' 
-          /etc/postgresql-custom/05-supautils.conf
+          /etc/postgresql-custom/conf.d/05-supautils.conf
       when: is_psql_oriole or is_psql_17 and stage2_nix
       become: yes
 
diff --git a/nix/packages/lib.nix b/nix/packages/lib.nix
@@ -36,25 +36,9 @@
           name = "postgresql.conf";
           path = ../../ansible/files/postgresql_config/postgresql.conf.j2;
         };
-        supautilsConfigFile = builtins.path {
-          name = "supautils.conf";
-          path = ../../ansible/files/postgresql_config/supautils.conf.j2;
-        };
-        loggingConfigFile = builtins.path {
-          name = "00-logging.conf";
-          path = ../../ansible/files/postgresql_config/postgresql-csvlog.conf;
-        };
-        autoexplainConfigFile = builtins.path {
-          name = "auto_explain.conf";
-          path = ../../ansible/files/postgresql_config/autoexplain.conf;
-        };
-        pgcronConfigFile = builtins.path {
-          name = "pg_cron.conf";
-          path = ../../ansible/files/postgresql_config/pgcron.conf;
-        };
-        readReplicaConfigFile = builtins.path {
-          name = "readreplica.conf";
-          path = ../../ansible/files/postgresql_config/custom_read_replica.conf.j2;
+        configConfDir = builtins.path {
+          name = "conf.d";
+          path = ../../ansible/files/postgresql_config/conf.d;
         };
         pgHbaConfigFile = builtins.path {
           name = "pg_hba.conf";
@@ -118,12 +102,8 @@
         mkdir -p $out/bin $out/etc/postgresql-custom $out/etc/postgresql $out/extension-custom-scripts
 
         # Copy config files with error handling
-        cp ${paths.supautilsConfigFile} $out/etc/postgresql-custom/05-supautils.conf || { echo "Failed to copy supautils.conf"; exit 1; }
+        cp -r ${paths.configConfDir} $out/etc/postgresql-custom/|| { echo "Failed to copy conf.d"; exit 1; }
         cp ${paths.pgconfigFile} $out/etc/postgresql/postgresql.conf || { echo "Failed to copy postgresql.conf"; exit 1; }
-        cp ${paths.loggingConfigFile} $out/etc/postgresql-custom/00-logging.conf || { echo "Failed to copy logging.conf"; exit 1; }
-        cp ${paths.autoexplainConfigFile} $out/etc/postgresql-custom/auto_explain.conf || { echo "Failed to copy auto_explain.conf"; exit 1; }
-        cp ${paths.pgcronConfigFile} $out/etc/postgresql-custom/pg_cron.conf || { echo "Failed to copy pg_cron.conf"; exit 1; }
-        cp ${paths.readReplicaConfigFile} $out/etc/postgresql-custom/04-read-replica.conf || { echo "Failed to copy read-replica.conf"; exit 1; }
         cp ${paths.pgHbaConfigFile} $out/etc/postgresql/pg_hba.conf || { echo "Failed to copy pg_hba.conf"; exit 1; }
         cp ${paths.pgIdentConfigFile} $out/etc/postgresql/pg_ident.conf || { echo "Failed to copy pg_ident.conf"; exit 1; }
         cp -r ${paths.postgresqlExtensionCustomScriptsPath}/* $out/extension-custom-scripts/ || { echo "Failed to copy custom scripts"; exit 1; }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ check_orioledb_enabled() {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`get_shared_buffers() {`
`18`		`- local opt_conf="/etc/postgresql-custom/01-generated-optimizations.conf"`
	`18`	`+ local opt_conf="/etc/postgresql-custom/conf.d/01-generated-optimizations.conf"`
`19`	`19`	`if [ ! -f "$opt_conf" ]; then`
`20`	`20`	`return 0`
`21`	`21`	`fi`