refactor(postgresql): split auto_explain and pg_cron out into their own config files

Author: hunleyd

Dockerfile-15

@@ -163,6 +163,8 @@ COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql.conf.j
 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_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

Dockerfile-17

@@ -163,6 +163,8 @@ COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql.conf.j
 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/pg_cron.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_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

Dockerfile-orioledb-17

@@ -163,6 +163,8 @@ COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql.conf.j
 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/pg_cron.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_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

ansible/files/postgresql_config/autoexplain.conf

@@ -0,0 +1,3 @@
+# auto_explain
+
+auto_explain.log_min_duration = 10s

ansible/files/postgresql_config/pgcron.conf

@@ -0,0 +1,3 @@
+# pg_cron
+
+cron.database_name = 'postgres'

ansible/files/postgresql_config/postgresql.conf.j2

@@ -159,11 +159,3 @@ jit_provider = 'llvmjit'		# JIT library to use
 # 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'
-
-#------------------------------------------------------------------------------
-# CUSTOMIZED OPTIONS
-#------------------------------------------------------------------------------
-
-# Add settings for extensions here
-auto_explain.log_min_duration = 10s
-cron.database_name = 'postgres'

ansible/tasks/finalize-ami.yml

@@ -4,6 +4,17 @@
     dest: /etc/postgresql-custom/00-logging.conf
     group: postgres
 
+- name: auto_explain and pg_cron confs
+  ansible.builtin.template:
+    dest: "/etc/postgresql-custom/{{ ext_item }}.conf"
+    group: 'postgres'
+    src: "files/postgresql_config/{{ ext_item | split('_') | join('') }}.conf"
+  loop:
+    - auto_explain
+    - pg_cron
+  loop_control:
+    loop_var: 'ext_item'
+
 - name: UFW - Allow SSH connections
   ufw:
     rule: allow

nix/packages/lib.nix

@@ -44,6 +44,14 @@
           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/pg_cron.conf;
+        };
         readReplicaConfigFile = builtins.path {
           name = "readreplica.conf";
           path = ../../ansible/files/postgresql_config/custom_read_replica.conf.j2;
@@ -113,6 +121,8 @@
         cp ${paths.supautilsConfigFile} $out/etc/postgresql-custom/05-supautils.conf || { echo "Failed to copy supautils.conf"; 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; }