diff options
| author | Christian Grothoff <christian@grothoff.org> | 2021-08-19 21:34:59 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-08-19 21:35:04 +0200 |
| commit | 5e5e4fbf006f120e15e9cd6b393c9d259398911d (patch) | |
| tree | 4322d7579b8e963e8956efa2e81eb12db520040e /debian/db | |
| parent | 1f4d5dcc2ac25ae3e785d1eb7c0a5946b1990f90 (diff) | |
| download | merchant-5e5e4fbf006f120e15e9cd6b393c9d259398911d.tar.gz merchant-5e5e4fbf006f120e15e9cd6b393c9d259398911d.tar.bz2 merchant-5e5e4fbf006f120e15e9cd6b393c9d259398911d.zip | |
-fix packaging issues
Diffstat (limited to 'debian/db')
| -rwxr-xr-x | debian/db/install/pgsql | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/debian/db/install/pgsql b/debian/db/install/pgsql index 289ccb77..8118fb7b 100755 --- a/debian/db/install/pgsql +++ b/debian/db/install/pgsql @@ -11,16 +11,10 @@ if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then . /etc/dbconfig-common/taler-merchant.conf case "$dbc_dbtype" in pgsql) - taler-config \ - -c $merchantdb_secretconf \ - -s "merchantdb-postgres" \ - -o "CONFIG" \ - -V "postgres:///$dbc_dbname" - taler-config \ - -c $merchantdb_overrideconf \ - -s "merchant" \ - -o "DB" \ - -V "postgres" + echo -e "[merchant]\nDB=postgres\n\n" > + $merchantdb_overrideconf + echo -e "[merchantdb-postgres]\nCONFIG=postgres:///${dbc_dbname}\n\n" > + $merchantdb_secretconf ;; sqlite3) # Later: use something like: @@ -53,16 +47,10 @@ if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then echo "GRANT SELECT, UPDATE ON ALL SEQUENCES IN SCHEMA public TO \"$dbc_dbuser\";" \ | sudo -u postgres psql "postgres:///$dbc_dbname" - taler-config \ - -c $merchantdb_secretconf \ - -s "merchantdb-postgres" \ - -o "CONFIG" \ - -V "postgres://$dbc_dbuser:$dbc_dbpass@$dbc_dbserver/$dbc_dbname" - taler-config \ - -c $merchantdb_overrideconf \ - -s "merchant" \ - -o "DB" \ - -V "postgres" + echo -e "[merchantdb-postgres]\nCONFIG=postgres://${dbc_user}:${dbc_dbpass}@${dbc_dbserver}/${dbc_dbname}\n\n" > + $merchantdb_secretconf + echo -e "[merchant]\nDB=postgres\n\n" > + $merchantdb_overrideconf ;; sqlite3) # Later: use something like: |