diff options
Diffstat (limited to 'debian/db/install')
-rwxr-xr-x | debian/db/install/pgsql | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/debian/db/install/pgsql b/debian/db/install/pgsql index d61008c..81f0a0e 100755 --- a/debian/db/install/pgsql +++ b/debian/db/install/pgsql @@ -2,19 +2,22 @@ set -eu +conf_anastasis_db=/etc/taler/secrets/anastasis-db.secret.conf +conf_override=/etc/taler/override.conf + # get database settings from dbconfig-common and configure # for ADMINISTRATIVE access if [ -f /etc/dbconfig-common/anastasis.conf ]; then . /etc/dbconfig-common/anastasis.conf case "$dbc_dbtype" in pgsql) - anastasis-config -w \ - -c /etc/anastasis.conf \ + anastasis-config \ + -c $conf_anastasis_db \ -s "stasis-postgres" \ -o "CONFIG" \ -V "postgres:///$dbc_dbname" - anastasis-config -w \ - -c /etc/anastasis.conf \ + anastasis-config \ + -c $conf_override \ -s "anastasis" \ -o "DB" \ -V "postgres" @@ -50,13 +53,13 @@ if [ -f /etc/dbconfig-common/anastasis.conf ]; then echo "GRANT SELECT, UPDATE ON ALL SEQUENCES IN SCHEMA public TO \"$dbc_dbuser\";" \ | sudo -u postgres psql "postgres:///$dbc_dbname" - anastasis-config -w \ - -c /etc/anastasis.conf \ + anastasis-config \ + -c $conf_anastasis_db \ -s "stasis-postgres" \ -o "CONFIG" \ -V "postgres://$dbc_dbuser:$dbc_dbpass@$dbc_dbserver/$dbc_dbname" - anastasis-config -w \ - -c /etc/anastasis.conf \ + anastasis-config \ + -c $conf_override \ -s "anastasis" \ -o "DB" \ -V "postgres" |