aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2021-08-26 16:22:19 +0200
committerFlorian Dold <florian@dold.me>2021-08-26 16:22:19 +0200
commit5a7e69c09a008d84272ca61062523325f8a9d483 (patch)
treeab091cfab7e7811e747df41a4dfa192835ec4066
parentc1462d6bc63896940931696425d6c41a9798cfae (diff)
downloadmerchant-5a7e69c09a008d84272ca61062523325f8a9d483.tar.gz
merchant-5a7e69c09a008d84272ca61062523325f8a9d483.tar.bz2
merchant-5a7e69c09a008d84272ca61062523325f8a9d483.zip
use different, merchant-specific config file for overrides
m---------contrib/merchant-backoffice0
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/db/install/pgsql4
3 files changed, 8 insertions, 2 deletions
diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
-Subproject 03c8c9b794905878175d07366267bdc01c3795b
+Subproject 4320467db1392e5f48a4acd079f7e2a253cf998
diff --git a/debian/changelog b/debian/changelog
index cafc755d..8edec8d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+taler-merchant (0.8.2-3) unstable; urgency=low
+
+ * Use separate config file for overrides.
+
+ -- Florian Dold <dold@taler.net> Thu, 26 Aug 2021 16:21:06 +0200
+
taler-merchant (0.8.2-2) unstable; urgency=low
* Fixed syntax issue in database configuration script.
diff --git a/debian/db/install/pgsql b/debian/db/install/pgsql
index 7a960471..67b030c0 100755
--- a/debian/db/install/pgsql
+++ b/debian/db/install/pgsql
@@ -1,14 +1,14 @@
#!/bin/bash
set -eu
merchantdb_secretconf=/etc/taler/secrets/merchant-db.secret.conf
-merchantdb_overrideconf=/etc/taler/overrides.conf
+merchantdb_overrideconf=/etc/taler/conf.d/merchant-debconf.conf
# get database settings from dbconfig-common and configure
# for ADMINISTRATIVE access
if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then
. /etc/dbconfig-common/taler-merchant.conf
case "$dbc_dbtype" in
pgsql)
- echo -e "[merchant]\nDB=postgres\n\n" > \
+ echo -e "# Config file auto-generated by Debian.\n[merchant]\nDB=postgres\n\n" > \
$merchantdb_overrideconf
echo -e "[merchantdb-postgres]\nCONFIG=postgres:///${dbc_dbname}\n\n" > \
$merchantdb_secretconf