Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita7327e0

Browse files
authored
refactor: Refactor PostgreSQL cron config and deprecations (#1951)
- 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`.
1 parent75c8517 commita7327e0

File tree

7 files changed

+5
-11
lines changed

7 files changed

+5
-11
lines changed

‎Dockerfile-15‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,6 @@ RUN sed -i \
237237
-e "s|#session_preload_libraries = ''|session_preload_libraries = 'supautils'|g" \
238238
-e "s|#include = '/etc/postgresql-custom/supautils.conf'|include = '/etc/postgresql-custom/supautils.conf'|g" \
239239
-e "s|#include = '/etc/postgresql-custom/wal-g.conf'|include = '/etc/postgresql-custom/wal-g.conf'|g" /etc/postgresql/postgresql.conf && \
240-
echo "cron.database_name = 'postgres'" >> /etc/postgresql/postgresql.conf && \
241-
#echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \
242240
echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
243241
echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
244242
usermod -aG postgres wal-g && \

‎Dockerfile-17‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,6 @@ RUN sed -i \
242242
-e "s|#session_preload_libraries = ''|session_preload_libraries = 'supautils'|g" \
243243
-e "s|#include = '/etc/postgresql-custom/supautils.conf'|include = '/etc/postgresql-custom/supautils.conf'|g" \
244244
-e "s|#include = '/etc/postgresql-custom/wal-g.conf'|include = '/etc/postgresql-custom/wal-g.conf'|g" /etc/postgresql/postgresql.conf && \
245-
echo "cron.database_name = 'postgres'" >> /etc/postgresql/postgresql.conf && \
246-
#echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \
247245
echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
248246
echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
249247
usermod -aG postgres wal-g && \

‎Dockerfile-orioledb-17‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,6 @@ RUN sed -i \
242242
-e "s|#session_preload_libraries = ''|session_preload_libraries = 'supautils'|g" \
243243
-e "s|#include = '/etc/postgresql-custom/supautils.conf'|include = '/etc/postgresql-custom/supautils.conf'|g" \
244244
-e "s|#include = '/etc/postgresql-custom/wal-g.conf'|include = '/etc/postgresql-custom/wal-g.conf'|g" /etc/postgresql/postgresql.conf && \
245-
echo "cron.database_name = 'postgres'" >> /etc/postgresql/postgresql.conf && \
246-
#echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \
247245
echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
248246
echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
249247
usermod -aG postgres wal-g && \
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cron.database_name = 'postgres'

‎ansible/files/postgresql_config/postgresql.conf.j2‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,4 +773,3 @@ include_dir = '/etc/postgresql-custom/conf.d' # include files ending in '.conf'
773773
#------------------------------------------------------------------------------
774774

775775
# Add settings for extensions here
776-
cron.database_name = 'postgres'

‎ansible/tasks/finalize-ami.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
src:"files/postgresql_config/conf.d/{{ ext_item }}.conf"
1212
loop:
1313
-auto_explain
14-
#- pg_cron
14+
-pg_cron
1515
loop_control:
1616
loop_var:'ext_item'
1717

‎ansible/vars.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ postgres_major:
1010

1111
# Full version strings for each major version
1212
postgres_release:
13-
postgresorioledb-17:"17.6.0.014-orioledb"
14-
postgres17:"17.6.1.057"
15-
postgres15:"15.14.1.057"
13+
postgresorioledb-17:"17.6.0.014-orioledb-INDATA257"
14+
postgres17:"17.6.1.057-INDATA257"
15+
postgres15:"15.14.1.057-INDATA257"
1616

1717
# Non Postgres Extensions
1818
pgbouncer_release:1.19.0

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp