config splitv0.14.1-dev.9

10 files changed, 11 insertions, 11 deletions

diff --git a/debian/taler-merchant.README.Debian b/debian/taler-merchant.README.Debian
index 32ac0f22..99cf02c1 100644
--- a/debian/taler-merchant.README.Debian
+++ b/debian/taler-merchant.README.Debian
@@ -9,7 +9,7 @@ deploying a configuration for the backend to the respective
 Web server at the "/taler-merchant/" endpoint.
 
 Note that you still must configure the currency accepted by the merchant in
-/etc/taler/taler.conf.
+/etc/taler-merchant/taler-merchant.conf.
 
 Afterwards, you can use the following commands to start, stop or
 restart the Taler merchant backend:
diff --git a/debian/taler-merchant.postinst b/debian/taler-merchant.postinst
index cac1355a..ed55fae8 100644
--- a/debian/taler-merchant.postinst
+++ b/debian/taler-merchant.postinst
@@ -32,11 +32,11 @@ configure)
     adduser --quiet --system --ingroup ${_GROUPNAME} --no-create-home --home ${TALER_HOME} ${_USERNAME}
   fi
 
-  if ! dpkg-statoverride --list /etc/taler/secrets/merchant-db.secret.conf >/dev/null 2>&1
+  if ! dpkg-statoverride --list /etc/taler-merchant/secrets/merchant-db.secret.conf >/dev/null 2>&1
   then
       dpkg-statoverride --add --update \
          taler-merchant-httpd root 460 \
-         /etc/taler/secrets/merchant-db.secret.conf
+         /etc/taler-merchant/secrets/merchant-db.secret.conf
   fi
   ;;
 
diff --git a/debian/taler-merchant.postrm b/debian/taler-merchant.postrm
index 693460ef..81359157 100644
--- a/debian/taler-merchant.postrm
+++ b/debian/taler-merchant.postrm
@@ -12,7 +12,7 @@ fi
 case "${1}" in
 purge)
     dpkg-statoverride --remove \
-       /etc/taler/secrets/merchant-db.secret.conf || true
+       /etc/taler-merchant/secrets/merchant-db.secret.conf || true
     deluser --quiet --system ${_USERNAME} || true
     ;;
 
diff --git a/debian/taler-merchant.taler-merchant-depositcheck.service b/debian/taler-merchant.taler-merchant-depositcheck.service
index 37ac7c37..501e152a 100644
--- a/debian/taler-merchant.taler-merchant-depositcheck.service
+++ b/debian/taler-merchant.taler-merchant-depositcheck.service
@@ -9,7 +9,7 @@ Restart=always
 RestartMode=direct
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-merchant-depositcheck -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-merchant-depositcheck -c /etc/taler-merchant/taler-merchant.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/debian/taler-merchant.taler-merchant-exchangekeyupdate.service b/debian/taler-merchant.taler-merchant-exchangekeyupdate.service
index b2e597f2..50f40a27 100644
--- a/debian/taler-merchant.taler-merchant-exchangekeyupdate.service
+++ b/debian/taler-merchant.taler-merchant-exchangekeyupdate.service
@@ -9,7 +9,7 @@ Restart=always
 RestartMode=direct
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-merchant-exchangekeyupdate -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-merchant-exchangekeyupdate -c /etc/taler-merchant/taler-merchant.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/debian/taler-merchant.taler-merchant-httpd.service b/debian/taler-merchant.taler-merchant-httpd.service
index e97bb6f6..19322c23 100644
--- a/debian/taler-merchant.taler-merchant-httpd.service
+++ b/debian/taler-merchant.taler-merchant-httpd.service
@@ -9,7 +9,7 @@ Restart=always
 RestartSec=1s
 RestartPreventExitStatus=9
 RuntimeMaxSec=3600s
-ExecStart=/usr/bin/taler-merchant-httpd -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-merchant-httpd -c /etc/taler-merchant/taler-merchant.conf -L INFO
 Slice=taler-merchant.slice
 
 [Install]
diff --git a/debian/taler-merchant.taler-merchant-kyccheck.service b/debian/taler-merchant.taler-merchant-kyccheck.service
index 8417ce1d..0982e5f6 100644
--- a/debian/taler-merchant.taler-merchant-kyccheck.service
+++ b/debian/taler-merchant.taler-merchant-kyccheck.service
@@ -9,7 +9,7 @@ Restart=always
 RestartMode=direct
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-merchant-kyccheck -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-merchant-kyccheck -c /etc/taler-merchant/taler-merchant.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/debian/taler-merchant.taler-merchant-reconciliation.service b/debian/taler-merchant.taler-merchant-reconciliation.service
index eef8f0f5..ec556db1 100644
--- a/debian/taler-merchant.taler-merchant-reconciliation.service
+++ b/debian/taler-merchant.taler-merchant-reconciliation.service
@@ -9,7 +9,7 @@ Restart=always
 RestartMode=direct
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-merchant-reconciliation -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-merchant-reconciliation -c /etc/taler-merchant/taler-merchant.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/debian/taler-merchant.taler-merchant-webhook.service b/debian/taler-merchant.taler-merchant-webhook.service
index 06a6a4a4..9c35996b 100644
--- a/debian/taler-merchant.taler-merchant-webhook.service
+++ b/debian/taler-merchant.taler-merchant-webhook.service
@@ -9,7 +9,7 @@ Restart=always
 RestartMode=direct
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-merchant-webhook -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-merchant-webhook -c /etc/taler-merchant/taler-merchant.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/debian/taler-merchant.taler-merchant-wirewatch.service b/debian/taler-merchant.taler-merchant-wirewatch.service
index c1ccba5a..32d6247e 100644
--- a/debian/taler-merchant.taler-merchant-wirewatch.service
+++ b/debian/taler-merchant.taler-merchant-wirewatch.service
@@ -9,7 +9,7 @@ Restart=always
 RestartMode=direct
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-merchant-wirewatch -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-merchant-wirewatch -c /etc/taler-merchant/taler-merchant.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full