Skip to content

Commit bdfabed

Browse files
authored
fix: corrects typo that prevented wal-g being enabled (#639)
* fix: corrects typo that prevented wal-g being enabled * chore: upgrade admin-mgr to latest release
1 parent 845159b commit bdfabed

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -903,10 +903,11 @@ COPY --chown=postgres:postgres ansible/files/postgresql_config/custom_walg.conf.
903903
COPY --chown=postgres:postgres ansible/files/walg_helper_scripts/wal_fetch.sh /home/postgres/wal_fetch.sh
904904
COPY ansible/files/walg_helper_scripts/wal_change_ownership.sh /root/wal_change_ownership.sh
905905

906-
RUN sed -i "s/#unix_socket_directories = '\/tmp'/unix_socket_directories = '\/var\/run\/postgresql'/g" /etc/postgresql/postgresql.conf && \
907-
sed -i "s/#session_preload_libraries = ''/session_preload_libraries = 'supautils'/g" /etc/postgresql/postgresql.conf && \
908-
sed -i "s/#include = '\/etc\/postgresql-custom\/supautils.conf'/include = '\/etc\/postgresql-custom\/supautils.conf'/g" /etc/postgresql/postgresql.conf && \
909-
sed -i "s/#include = '\/etc\/postgresql-custom\/wal-g.conf''/include = '\/etc\/postgresql-custom\/wal-g.conf'/g" /etc/postgresql/postgresql.conf && \
906+
RUN sed -i \
907+
-e "s|#unix_socket_directories = '/tmp'|unix_socket_directories = '/var/run/postgresql'|g" \
908+
-e "s|#session_preload_libraries = ''|session_preload_libraries = 'supautils'|g" \
909+
-e "s|#include = '/etc/postgresql-custom/supautils.conf'|include = '/etc/postgresql-custom/supautils.conf'|g" \
910+
-e "s|#include = '/etc/postgresql-custom/wal-g.conf'|include = '/etc/postgresql-custom/wal-g.conf'|g" /etc/postgresql/postgresql.conf && \
910911
echo "cron.database_name = 'postgres'" >> /etc/postgresql/postgresql.conf && \
911912
echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \
912913
echo "pgsodium.getkey_script= '/usr/lib/postgresql/${postgresql_major}/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \

ansible/vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ postgres_exporter_release_checksum:
4242
amd64: sha256:ff541bd3ee19c0ae003d71424a75edfcc8695e828dd20d5b4555ce433c89d60b
4343

4444
adminapi_release: 0.44.3
45-
adminmgr_release: 0.3.1
45+
adminmgr_release: 0.4.0
4646

4747
# Postgres Extensions
4848
postgis_release: "3.3.2"

0 commit comments

Comments
 (0)