From 6e58cfa7dba3f1371293fe05e29146450ccf8ea0 Mon Sep 17 00:00:00 2001 From: Douglas J Hunley Date: Wed, 26 Nov 2025 10:43:03 -0500 Subject: [PATCH] refactor: Refactor PostgreSQL cron config and deprecations - Move `cron.database_name` setting to `conf.d/pg_cron.conf` via `include_dir`, removing direct echo from `postgresql.conf`. - Update Dockerfiles (`Dockerfile-15`, `Dockerfile-17`, `Dockerfile-orioledb-17`) to remove direct `echo` commands for `cron.database_name`. - Add `pg_cron.conf` template to `ansible/tasks/finalize-ami.yml`. - In `Dockerfile-17`, comment out the deprecated `db_user_namespace` setting. - Append project-specific suffix `-INDATA-257` to PostgreSQL release versions in `ansible/vars.yml`. --- Dockerfile-15 | 2 -- Dockerfile-17 | 2 -- Dockerfile-orioledb-17 | 2 -- ansible/files/postgresql_config/conf.d/pg_cron.conf | 1 + ansible/files/postgresql_config/postgresql.conf.j2 | 1 - ansible/tasks/finalize-ami.yml | 2 +- ansible/vars.yml | 6 +++--- 7 files changed, 5 insertions(+), 11 deletions(-) create mode 100644 ansible/files/postgresql_config/conf.d/pg_cron.conf diff --git a/Dockerfile-15 b/Dockerfile-15 index e79cb2e5b..39497ca96 100644 --- a/Dockerfile-15 +++ b/Dockerfile-15 @@ -237,8 +237,6 @@ RUN sed -i \ -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" \ -e "s|#include = '/etc/postgresql-custom/wal-g.conf'|include = '/etc/postgresql-custom/wal-g.conf'|g" /etc/postgresql/postgresql.conf && \ - echo "cron.database_name = 'postgres'" >> /etc/postgresql/postgresql.conf && \ - #echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \ echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \ echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \ usermod -aG postgres wal-g && \ diff --git a/Dockerfile-17 b/Dockerfile-17 index cad7b76b9..eedd1eba4 100644 --- a/Dockerfile-17 +++ b/Dockerfile-17 @@ -242,8 +242,6 @@ RUN sed -i \ -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" \ -e "s|#include = '/etc/postgresql-custom/wal-g.conf'|include = '/etc/postgresql-custom/wal-g.conf'|g" /etc/postgresql/postgresql.conf && \ - echo "cron.database_name = 'postgres'" >> /etc/postgresql/postgresql.conf && \ - #echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \ echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \ echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \ usermod -aG postgres wal-g && \ diff --git a/Dockerfile-orioledb-17 b/Dockerfile-orioledb-17 index 19fae02be..caf35ca88 100644 --- a/Dockerfile-orioledb-17 +++ b/Dockerfile-orioledb-17 @@ -242,8 +242,6 @@ RUN sed -i \ -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" \ -e "s|#include = '/etc/postgresql-custom/wal-g.conf'|include = '/etc/postgresql-custom/wal-g.conf'|g" /etc/postgresql/postgresql.conf && \ - echo "cron.database_name = 'postgres'" >> /etc/postgresql/postgresql.conf && \ - #echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \ echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \ echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \ usermod -aG postgres wal-g && \ diff --git a/ansible/files/postgresql_config/conf.d/pg_cron.conf b/ansible/files/postgresql_config/conf.d/pg_cron.conf new file mode 100644 index 000000000..e5848e50e --- /dev/null +++ b/ansible/files/postgresql_config/conf.d/pg_cron.conf @@ -0,0 +1 @@ +cron.database_name = 'postgres' diff --git a/ansible/files/postgresql_config/postgresql.conf.j2 b/ansible/files/postgresql_config/postgresql.conf.j2 index fc77c63bc..915e3677b 100644 --- a/ansible/files/postgresql_config/postgresql.conf.j2 +++ b/ansible/files/postgresql_config/postgresql.conf.j2 @@ -773,4 +773,3 @@ include_dir = '/etc/postgresql-custom/conf.d' # include files ending in '.conf' #------------------------------------------------------------------------------ # Add settings for extensions here -cron.database_name = 'postgres' diff --git a/ansible/tasks/finalize-ami.yml b/ansible/tasks/finalize-ami.yml index 5b9dee913..a02333e7d 100644 --- a/ansible/tasks/finalize-ami.yml +++ b/ansible/tasks/finalize-ami.yml @@ -11,7 +11,7 @@ src: "files/postgresql_config/conf.d/{{ ext_item }}.conf" loop: - auto_explain - # - pg_cron + - pg_cron loop_control: loop_var: 'ext_item' diff --git a/ansible/vars.yml b/ansible/vars.yml index 716a9b8b9..89c73813d 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -10,9 +10,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.6.0.013-orioledb" - postgres17: "17.6.1.056" - postgres15: "15.14.1.056" + postgresorioledb-17: "17.6.0.013-orioledb-INDATA-257" + postgres17: "17.6.1.056-INDATA-257" + postgres15: "15.14.1.056-INDATA-257" # Non Postgres Extensions pgbouncer_release: 1.19.0