diff options
Diffstat (limited to 'debian/db/install/pgsql')
| -rwxr-xr-x | debian/db/install/pgsql | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/debian/db/install/pgsql b/debian/db/install/pgsql index 45bf40b4..289ccb77 100755 --- a/debian/db/install/pgsql +++ b/debian/db/install/pgsql @@ -2,6 +2,9 @@ set -eu +merchantdb_secretconf=/etc/taler/secrets/merchant-db.secret.conf +merchantdb_overrideconf=/etc/taler/overrides.conf + # get database settings from dbconfig-common and configure # for ADMINISTRATIVE access if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then @@ -9,12 +12,12 @@ if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then case "$dbc_dbtype" in pgsql) taler-config \ - -c /etc/taler-merchant.conf \ + -c $merchantdb_secretconf \ -s "merchantdb-postgres" \ -o "CONFIG" \ -V "postgres:///$dbc_dbname" taler-config \ - -c /etc/taler-merchant.conf \ + -c $merchantdb_overrideconf \ -s "merchant" \ -o "DB" \ -V "postgres" @@ -36,7 +39,7 @@ if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then fi # Run database initialization logic -sudo -u postgres taler-merchant-dbinit -c /etc/taler-merchant.conf +sudo -u postgres taler-merchant-dbinit -c /etc/taler/taler.conf # get database settings from dbconfig-common and configure @@ -51,12 +54,12 @@ if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then | sudo -u postgres psql "postgres:///$dbc_dbname" taler-config \ - -c /etc/taler-merchant.conf \ + -c $merchantdb_secretconf \ -s "merchantdb-postgres" \ -o "CONFIG" \ -V "postgres://$dbc_dbuser:$dbc_dbpass@$dbc_dbserver/$dbc_dbname" taler-config \ - -c /etc/taler-merchant.conf \ + -c $merchantdb_overrideconf \ -s "merchant" \ -o "DB" \ -V "postgres" |