-fix packaging issues

4 files changed, 44 insertions, 26 deletions

diff --git a/debian/changelog b/debian/changelog
index ee547f88..83c32762 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+taler-merchant (0.8.2-1) unstable; urgency=low
+
+  * Fix systemd service file to include target.
+  * Avoid use of taler-config when generating configuration files.
+  * Update README.Debian to reflect current package better.
+
+  -- Christian Grothoff <grothoff@taler.net>  Thu, 19 Aug 2021 23:23:21 +0200
+
 taler-merchant (0.8.2) unstable; urgency=low
 
   * Official release of GNU Taler merchant 0.8.2.
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:
diff --git a/debian/taler-merchant.README.Debian b/debian/taler-merchant.README.Debian
index 86837e79..4cae6f4b 100644
--- a/debian/taler-merchant.README.Debian
+++ b/debian/taler-merchant.README.Debian
@@ -8,12 +8,31 @@ This package is integrated with Apache or Nginx, automatically
 deploying a configuration for the backend to the respective
 Web server at the "/taler-merchant/" endpoint.
 
-To access the privileged parts of the Taler backend, you need to provide the
-API KEY in an HTTP "Authorization" header. This Debian package creates a
-random API KEY and stores it in plaintext in
-"/var/lib/taler-merchant/master-api-key.txt."  You can change the key by
-editing the respective Web server's configuration. The "master-api-key.txt"
-file is not actually required and provided for convenience.
+Note that you still must configure the currency accepted by the merchant in
+/etc/taler/taler.conf.
 
+Afterwards, you can use the following commands to start, stop or
+restart the Taler merchant backend:
+
+  # systemctl start taler-merchant.service
+  # systemctl stop taler-merchant.service
+  # systemctl restart taler-merchant.service
+
+To permanently the backend whenever the system boots, use:
+
+  # systemctl enable taler-merchant
+
+By default, the backend will be available at
+https://localhost:9966/ and configured via
+a browser at that endpoint.
+
+You can improve the security of the setup by enabling the use
+of uinx domain sockets, see
+
+$ info taler-merchant "Secure setup"
+
+You may also want to enable the reverse proxy by
+symlinking the respective configuration file to the
+"sites-enabled/" directory of your chosen Web server.
 
  -- Christian Grothoff <grothoff@gnu.org>  Fri 01 Jan 2021 11:37:14 AM CET
diff --git a/debian/taler-merchant.taler-merchant-httpd.service b/debian/taler-merchant.taler-merchant-httpd.service
index 7d931742..6737fadf 100644
--- a/debian/taler-merchant.taler-merchant-httpd.service
+++ b/debian/taler-merchant.taler-merchant-httpd.service
@@ -6,3 +6,6 @@ User=taler-merchant-httpd
 Type=simple
 Restart=on-failure
 ExecStart=/usr/bin/taler-merchant-httpd -c /etc/taler/taler.conf
+
+[Install]
+WantedBy=multi-user.target