diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-06-20 22:09:14 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-06-20 22:09:14 +0200 |
| commit | b481de13fd218cc96b85b4a2a1fc0bdf75648c7f (patch) | |
| tree | a035cc695e7f454f83052c5fbe1fbbdbf1c72174 | |
| parent | bc003c390f08031ec772ea0d1aaf9861c2ae03ac (diff) | |
| download | merchant-b481de13fd218cc96b85b4a2a1fc0bdf75648c7f.tar.gz merchant-b481de13fd218cc96b85b4a2a1fc0bdf75648c7f.tar.bz2 merchant-b481de13fd218cc96b85b4a2a1fc0bdf75648c7f.zip | |
-update dependencies, clean up SQL
| -rw-r--r-- | debian/control | 3 | ||||
| -rwxr-xr-x | debian/db/install/pgsql | 2 | ||||
| -rw-r--r-- | debian/taler-merchant.postrm | 14 |
3 files changed, 16 insertions, 3 deletions
diff --git a/debian/control b/debian/control index 587403d5..f9176642 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,7 @@ Build-Depends: gettext, libgnunet-dev (>=0.17.0), libtalerexchange-dev (>=0.9.0), - libpq-dev (>=13), - libsqlite3-dev (>=3.8), + libpq-dev (>=13.0), po-debconf, libqrencode-dev, zlib1g-dev, diff --git a/debian/db/install/pgsql b/debian/db/install/pgsql index 5ad50a33..33b8cb1d 100755 --- a/debian/db/install/pgsql +++ b/debian/db/install/pgsql @@ -17,7 +17,7 @@ if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then $merchantdb_secretconf # Allow the taler-merchant-httpd user to create schemas, needed by dbinit - echo 'GRANT CREATE on database "talermerchant" to "taler-merchant-httpd";' | sudo -u postgres psql -f - + echo "GRANT CREATE ON DATABASE \"${dbc_dbtype}\" TO \"taler-merchant-httpd\";" | sudo -u postgres psql -f - # Run database initialization logic sudo -u taler-merchant-httpd taler-merchant-dbinit -c /etc/taler/taler.conf ;; diff --git a/debian/taler-merchant.postrm b/debian/taler-merchant.postrm index bf628b36..716f8982 100644 --- a/debian/taler-merchant.postrm +++ b/debian/taler-merchant.postrm @@ -11,6 +11,20 @@ if [ -f /usr/share/dbconfig-common/dpkg/postrm.pgsql ]; then dbc_go taler-merchant "$@" fi +case "${1}" in +purge) +# TODO: anything to clean up? Like: +# rm -f /etc/taler/merchant-overrides.conf + ;; +remove | upgrade | failed-upgrade | abort-install | abort-upgrade | disappear) + ;; + + *) + echo "postrm called with unknown argument \`${1}'" >&2 + exit 1 + ;; +esac + #DEBHELPER# exit 0 |