wassname/docker-postgresql
1
0
Fork 0
mirror of https://github.com/wassname/docker-postgresql.git synced 2026-08-16 11:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

PSQL_SSLMODE config parameter renamed to REPLICATION_SSLMODE

Browse Source
This commit is contained in:
Sameer Naik
2015-11-26 21:03:51 +05:30
parent b6f0cba6a7
commit 761ec9645c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changelog.md
+1
View File
@@ -4,6 +4,7 @@
- complete rewrite - complete rewrite
- `PSQL_TRUST_LOCALNET` config parameter renamed to `PG_TRUST_LOCALNET` - `PSQL_TRUST_LOCALNET` config parameter renamed to `PG_TRUST_LOCALNET`
- `PSQL_MODE` config parameter renamed to `REPLICATION_MODE` - `PSQL_MODE` config parameter renamed to `REPLICATION_MODE`
- `PSQL_SSLMODE` config parameter renamed to `REPLICATION_SSLMODE`
**9.4-2** **9.4-2**
- added replication options - added replication options
entrypoint.sh
+4 -4
View File
@@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
set -e set -e
PSQL_SSLMODE=${PSQL_SSLMODE:-}
PG_TRUST_LOCALNET=${PG_TRUST_LOCALNET:-$PSQL_TRUST_LOCALNET} # backward compatibility PG_TRUST_LOCALNET=${PG_TRUST_LOCALNET:-$PSQL_TRUST_LOCALNET} # backward compatibility
PG_TRUST_LOCALNET=${PG_TRUST_LOCALNET:-false} PG_TRUST_LOCALNET=${PG_TRUST_LOCALNET:-false}
@@ -12,6 +11,7 @@ REPLICATION_USER=${REPLICATION_USER:-}
REPLICATION_PASS=${REPLICATION_PASS:-} REPLICATION_PASS=${REPLICATION_PASS:-}
REPLICATION_HOST=${REPLICATION_HOST:-} REPLICATION_HOST=${REPLICATION_HOST:-}
REPLICATION_PORT=${REPLICATION_PORT:-} REPLICATION_PORT=${REPLICATION_PORT:-}
REPLICATION_SSLMODE=${REPLICATION_SSLMODE:-}
DB_NAME=${DB_NAME:-} DB_NAME=${DB_NAME:-}
DB_USER=${DB_USER:-} DB_USER=${DB_USER:-}
@@ -125,7 +125,7 @@ initialize_database() {
slave|snapshot) slave|snapshot)
# default params # default params
REPLICATION_PORT=${REPLICATION_PORT:-5432} REPLICATION_PORT=${REPLICATION_PORT:-5432}
PSQL_SSLMODE=${PSQL_SSLMODE:-disable} REPLICATION_SSLMODE=${REPLICATION_SSLMODE:-disable}
if [[ -z $REPLICATION_HOST ]]; then if [[ -z $REPLICATION_HOST ]]; then
echo "ERROR! Cannot continue without the REPLICATION_HOST. Exiting..." echo "ERROR! Cannot continue without the REPLICATION_HOST. Exiting..."
@@ -299,7 +299,7 @@ configure_recovery() {
echo "Configuring recovery..." echo "Configuring recovery..."
exec_as_postgres touch ${PG_RECOVERY_CONF} exec_as_postgres touch ${PG_RECOVERY_CONF}
( echo "standby_mode = 'on'"; ( echo "standby_mode = 'on'";
echo "primary_conninfo = 'host=${REPLICATION_HOST} port=${REPLICATION_PORT} user=${REPLICATION_USER} password=${REPLICATION_PASS} sslmode=${PSQL_SSLMODE}'"; echo "primary_conninfo = 'host=${REPLICATION_HOST} port=${REPLICATION_PORT} user=${REPLICATION_USER} password=${REPLICATION_PASS} sslmode=${REPLICATION_SSLMODE}'";
echo "trigger_file = '/tmp/postgresql.trigger'" ) > ${PG_RECOVERY_CONF} echo "trigger_file = '/tmp/postgresql.trigger'" ) > ${PG_RECOVERY_CONF}
fi fi
else else
@@ -307,7 +307,7 @@ configure_recovery() {
set_recovery_param "port" "${REPLICATION_PORT}" set_recovery_param "port" "${REPLICATION_PORT}"
set_recovery_param "user" "${REPLICATION_USER}" set_recovery_param "user" "${REPLICATION_USER}"
set_recovery_param "password" "${REPLICATION_PASS}" set_recovery_param "password" "${REPLICATION_PASS}"
set_recovery_param "sslmode" "${PSQL_SSLMODE}" set_recovery_param "sslmode" "${REPLICATION_SSLMODE}"
fi fi
} }