diff --git a/.example.env b/.example.env index b4088802..5a7750d7 100644 --- a/.example.env +++ b/.example.env @@ -13,7 +13,7 @@ LANG=en_US.UTF-8 # locale filter to include in the locale generator LANGS="en_US.UTF-8,id_ID.UTF-8" -POSTGRES_MAJOR_VERSION=15 +POSTGRES_MAJOR_VERSION=16 POSTGIS_MAJOR_VERSION=3 POSTGIS_MINOR_RELEASE=4 BUILD_TIMESCALE=false \ No newline at end of file diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml index 48a644ba..2d3edb00 100644 --- a/.github/workflows/build-latest.yaml +++ b/.github/workflows/build-latest.yaml @@ -27,7 +27,7 @@ jobs: strategy: matrix: postgresMajorVersion: - - 15 + - 16 postgisMajorVersion: - 3 postgisMinorRelease: @@ -90,7 +90,7 @@ jobs: strategy: matrix: postgresMajorVersion: - - 15 + - 16 postgisMajorVersion: - 3 postgisMinorRelease: diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml index da6712f6..5b62dea6 100644 --- a/.github/workflows/deploy-image.yaml +++ b/.github/workflows/deploy-image.yaml @@ -29,7 +29,7 @@ jobs: strategy: matrix: postgresMajorVersion: - - 15 + - 16 postgisMajorVersion: - 3 postgisMinorRelease: diff --git a/scripts/env-data.sh b/scripts/env-data.sh index ecc6b459..c925cbc7 100644 --- a/scripts/env-data.sh +++ b/scripts/env-data.sh @@ -21,7 +21,6 @@ EXTDIR="/usr/share/postgresql/${POSTGRES_MAJOR_VERSION}/extension/" SETVARS="POSTGIS_ENABLE_OUTDB_RASTERS=1 POSTGIS_GDAL_ENABLED_DRIVERS=ENABLE_ALL" LOCALONLY="-c listen_addresses='127.0.0.1'" PG_BASEBACKUP="/usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_basebackup" -PROMOTE_FILE="/tmp/pg_promote_master" NODE_PROMOTION="/usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl" DATA_DIR_CONTROL="/usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_controldata" PGSTAT_TMP="/var/run/postgresql/" diff --git a/scripts/setup-conf.sh b/scripts/setup-conf.sh index 75c2ef86..a0e60231 100644 --- a/scripts/setup-conf.sh +++ b/scripts/setup-conf.sh @@ -71,7 +71,6 @@ checkpoint_timeout = ${CHECK_POINT_TIMEOUT} primary_conninfo = 'host=${REPLICATE_FROM} port=${REPLICATE_PORT} user=${REPLICATION_USER} password=${REPLICATION_PASS} ${PARAMS}' recovery_target_timeline=${TARGET_TIMELINE} recovery_target_action=${TARGET_ACTION} -promote_trigger_file = '${PROMOTE_FILE}' EOF if [[ ${ARCHIVE_MODE} =~ [Oo][Nn] ]];then cat >> "${ROOT_CONF}"/streaming_replication.conf <