Compare commits
2 Commits
d0c3929f6c
...
218b2a50ce
Author | SHA1 | Date |
---|---|---|
Kai Schlachter | 218b2a50ce | |
Kai Schlachter | 013ddb8ff6 |
|
@ -136,6 +136,7 @@ done
|
|||
createDatabaseIfRequested
|
||||
initDatabase
|
||||
migrateDatabaseTo47
|
||||
initSuperslave
|
||||
|
||||
if [ ${USE_EXISTING_CONFIG_FILE:-false} = 'false' ]; then
|
||||
echo "(re-)generating config file from environment variables"
|
||||
|
|
|
@ -15,7 +15,6 @@ function derivePostgreSQLSettingsFromExistingConfigFile {
|
|||
}
|
||||
|
||||
function derivePostgreSQLSettingsFromEnvironment {
|
||||
# Configure mysql env vars
|
||||
# Configure gpgsql env vars
|
||||
: "${PDNS_gpgsql_host:=pgsql}"
|
||||
: "${PDNS_gpgsql_port:=5432}"
|
||||
|
@ -108,6 +107,13 @@ done
|
|||
|
||||
createDatabaseIfRequested
|
||||
initDatabase
|
||||
initSuperslave
|
||||
|
||||
if [ ${USE_EXISTING_CONFIG_FILE:-false} = 'false' ]; then
|
||||
echo "(re-)generating config file from environment variables"
|
||||
generateAndInstallConfigFileFromEnvironment
|
||||
fi
|
||||
|
||||
|
||||
unset PGPASSWORD
|
||||
|
||||
|
|
Loading…
Reference in New Issue