36 files changed, 40 insertions, 119 deletions
diff --git a/debian/etc-taler-auditor/taler/conf.d/auditor-system.conf b/debian/etc-taler-auditor/taler/conf.d/auditor-system.conf
deleted file mode 100644
index 0cc933309..000000000
--- a/debian/etc-taler-auditor/taler/conf.d/auditor-system.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Configuration settings for system parameters of the auditor.
-#
-# Read secret sections into configuration, but only
-# if we have permission to do so.
-@inline-secret@ auditordb-postgres ../secrets/auditor-db.secret.conf
-
-[auditor]
-
-# Only supported database is Postgres right now.
-DATABASE = postgres
-
-SERVE = unix
-UNIXPATH_MODE = 666
diff --git a/debian/etc-taler-auditor/taler/secrets/auditor-db.secret.conf b/debian/etc-taler-auditor/taler/secrets/auditor-db.secret.conf
deleted file mode 100644
index 1278a563b..000000000
--- a/debian/etc-taler-auditor/taler/secrets/auditor-db.secret.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Database configuration for the Taler auditor.
-
-[auditordb-postgres]
-
-# Typically, there should only be a single line here, of the form:
-
-CONFIG=postgres:///taler-auditor
-
-# The details of the URI depend on where the database lives and how
-# access control was configured.
diff --git a/debian/etc-taler-exchange/taler/conf.d/exchange-business.conf b/debian/etc-taler-exchange/taler-exchange/conf.d/exchange-business.conf
index c48cb5c96..c48cb5c96 100644
--- a/debian/etc-taler-exchange/taler/conf.d/exchange-business.conf
+++ b/debian/etc-taler-exchange/taler-exchange/conf.d/exchange-business.conf
diff --git a/debian/etc-taler-exchange/taler/conf.d/exchange-coins.conf b/debian/etc-taler-exchange/taler-exchange/conf.d/exchange-coins.conf
index 8294525cb..8294525cb 100644
--- a/debian/etc-taler-exchange/taler/conf.d/exchange-coins.conf
+++ b/debian/etc-taler-exchange/taler-exchange/conf.d/exchange-coins.conf
diff --git a/debian/etc-taler-exchange/taler/conf.d/exchange-system.conf b/debian/etc-taler-exchange/taler-exchange/conf.d/exchange-system.conf
index af37f1913..af37f1913 100644
--- a/debian/etc-taler-exchange/taler/conf.d/exchange-system.conf
+++ b/debian/etc-taler-exchange/taler-exchange/conf.d/exchange-system.conf
diff --git a/debian/etc-libtalerexchange/taler/overrides.conf b/debian/etc-taler-exchange/taler-exchange/overrides.conf
index 60296ead4..60296ead4 100644
--- a/debian/etc-libtalerexchange/taler/overrides.conf
+++ b/debian/etc-taler-exchange/taler-exchange/overrides.conf
diff --git a/debian/etc-taler-exchange/taler/secrets/exchange-accountcredentials-1.secret.conf b/debian/etc-taler-exchange/taler-exchange/secrets/exchange-accountcredentials-1.secret.conf
index 8c8d14320..8c8d14320 100644
--- a/debian/etc-taler-exchange/taler/secrets/exchange-accountcredentials-1.secret.conf
+++ b/debian/etc-taler-exchange/taler-exchange/secrets/exchange-accountcredentials-1.secret.conf
diff --git a/debian/etc-taler-exchange/taler/secrets/exchange-db.secret.conf b/debian/etc-taler-exchange/taler-exchange/secrets/exchange-db.secret.conf
index 08c20074c..08c20074c 100644
--- a/debian/etc-taler-exchange/taler/secrets/exchange-db.secret.conf
+++ b/debian/etc-taler-exchange/taler-exchange/secrets/exchange-db.secret.conf
diff --git a/debian/etc-libtalerexchange/taler/taler.conf b/debian/etc-taler-exchange/taler-exchange/taler-exchange.conf
index 2cf815656..57493dab5 100644
--- a/debian/etc-libtalerexchange/taler/taler.conf
+++ b/debian/etc-taler-exchange/taler-exchange/taler-exchange.conf
@@ -1,7 +1,7 @@
 # Main entry point for the GNU Taler configuration.
 #
 # Structure:
-# - taler.conf is the main configuration entry point
+# - taler-exchange.conf is the main configuration entry point
 #   used by all Taler components (the file you are currently
 #   looking at.
 # - overrides.conf contains configuration overrides that are
@@ -19,10 +19,8 @@
 #   can read it.  All files in it should end with
 #   ".secret.conf".
 
-[taler]
+[exchange]
 
-# Currency of the Taler deployment.  This setting applies to all Taler
-# components that only support a single currency.
 #currency = KUDOS
 
 # Smallest currency unit handled by the underlying bank system.  Taler payments
@@ -33,15 +31,6 @@
 # Monthly amount that mandatorily triggers an AML check
 #AML_THRESHOLD = KUDOS:10000000
 
-[paths]
-
-TALER_HOME = /var/lib/taler/
-TALER_RUNTIME_DIR = /run/taler/
-TALER_CACHE_HOME = /var/cache/taler/
-TALER_CONFIG_HOME = /etc/taler/
-TALER_DATA_HOME = /var/lib/taler/
-
-
 # Inline configurations from all Taler components.
 @inline-matching@ conf.d/*.conf
 
diff --git a/debian/libtalerexchange.install b/debian/libtalerexchange.install
index f3c52ba8d..a773400c1 100644
--- a/debian/libtalerexchange.install
+++ b/debian/libtalerexchange.install
@@ -1,10 +1 @@
 usr/lib/*/libtaler*.so.*
-
-# FIXME:  All this should eventually go into taler-base.
-usr/share/taler/config.d/paths.conf
-usr/share/taler/config.d/currencies.conf
-usr/share/taler/config.d/taler.conf
-debian/etc-libtalerexchange/* etc/
-usr/bin/taler-config
-usr/share/man/man5/taler.conf.5
-usr/share/man/man1/taler-config*
diff --git a/debian/taler-auditor.install b/debian/taler-auditor.install
index aa69db519..43d5f5768 100644
--- a/debian/taler-auditor.install
+++ b/debian/taler-auditor.install
@@ -1,23 +1,20 @@
 usr/bin/taler-auditor
-usr/bin/taler-auditor-dbconfig
-usr/bin/taler-auditor-dbinit
-usr/bin/taler-auditor-httpd
-usr/bin/taler-auditor-offline
-usr/bin/taler-auditor-sync
+usr/bin/taler-auditor-*
 usr/bin/taler-helper-auditor-*
 
-usr/lib/*/taler/libtaler_plugin_auditor*.so
+usr/lib/*/taler-auditor/libtaler_plugin_auditor*.so
 usr/lib/*/libauditor*
 usr/lib/*/libtalerauditordb*
 
 usr/share/man/man1/taler-auditor*
 usr/share/man/man1/taler-helper-auditor*
+usr/share/man/man5/taler-auditor*
 
 usr/share/info/taler-auditor*
 
-usr/share/taler/config.d/auditor*
-usr/share/taler/sql/auditor/*
-usr/share/taler/auditor/spa/*
+usr/share/taler-auditor/config.d/auditor*
+usr/share/taler-auditor/sql/*
+usr/share/taler-auditor/spa/*
 
-# Configuration
+# Debian-specific configuration files for /etc/
 debian/etc-taler-auditor/* etc/
diff --git a/debian/taler-auditor.taler-auditor-httpd.service b/debian/taler-auditor.taler-auditor-httpd.service
index 97116a8de..cc724149e 100644
--- a/debian/taler-auditor.taler-auditor-httpd.service
+++ b/debian/taler-auditor.taler-auditor-httpd.service
@@ -16,7 +16,7 @@ RestartPreventExitStatus=9
 StartLimitBurst=5
 StartLimitInterval=5s
 
-ExecStart=/usr/bin/taler-auditor-httpd -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-auditor-httpd -c /etc/taler-auditor/taler-auditor.conf -L INFO
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=yes
diff --git a/debian/taler-auditor.taler-helper-auditor-aggregation.service b/debian/taler-auditor.taler-helper-auditor-aggregation.service
index d226d7236..bc3b4b94b 100644
--- a/debian/taler-auditor.taler-helper-auditor-aggregation.service
+++ b/debian/taler-auditor.taler-helper-auditor-aggregation.service
@@ -9,7 +9,7 @@ Type=simple
 Restart=always
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-helper-auditor-aggregation -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-helper-auditor-aggregation -c /etc/taler-auditor/taler-auditor.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/debian/taler-auditor.taler-helper-auditor-coins.service b/debian/taler-auditor.taler-helper-auditor-coins.service
index 1c6f02de2..758909563 100644
--- a/debian/taler-auditor.taler-helper-auditor-coins.service
+++ b/debian/taler-auditor.taler-helper-auditor-coins.service
@@ -9,7 +9,7 @@ Type=simple
 Restart=always
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-helper-auditor-coins -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-helper-auditor-coins -c /etc/taler-auditor/taler-auditor.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/debian/taler-auditor.taler-helper-auditor-deposits.service b/debian/taler-auditor.taler-helper-auditor-deposits.service
index e474314cf..c68682ab7 100644
--- a/debian/taler-auditor.taler-helper-auditor-deposits.service
+++ b/debian/taler-auditor.taler-helper-auditor-deposits.service
@@ -9,7 +9,7 @@ Type=simple
 Restart=always
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-helper-auditor-deposits -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-helper-auditor-deposits -c /etc/taler-auditor/taler-auditor.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/debian/taler-auditor.taler-helper-auditor-purses.service b/debian/taler-auditor.taler-helper-auditor-purses.service
index 8429a8c8f..80698275d 100644
--- a/debian/taler-auditor.taler-helper-auditor-purses.service
+++ b/debian/taler-auditor.taler-helper-auditor-purses.service
@@ -9,7 +9,7 @@ Type=simple
 Restart=always
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-helper-auditor-purses -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-helper-auditor-purses -c /etc/taler-auditor/taler-auditor.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/debian/taler-auditor.taler-helper-auditor-reserves.service b/debian/taler-auditor.taler-helper-auditor-reserves.service
index 388ae5f1a..c6336445d 100644
--- a/debian/taler-auditor.taler-helper-auditor-reserves.service
+++ b/debian/taler-auditor.taler-helper-auditor-reserves.service
@@ -9,7 +9,7 @@ Type=simple
 Restart=always
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-helper-auditor-reserves -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-helper-auditor-reserves -c /etc/taler-auditor/taler-auditor.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/debian/taler-auditor.taler-helper-auditor-transfer.service b/debian/taler-auditor.taler-helper-auditor-transfer.service
index 9294879cd..d77b2e2f9 100644
--- a/debian/taler-auditor.taler-helper-auditor-transfer.service
+++ b/debian/taler-auditor.taler-helper-auditor-transfer.service
@@ -9,7 +9,7 @@ Type=simple
 Restart=always
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-helper-auditor-transfer -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-helper-auditor-transfer -c /etc/taler-auditor/taler-auditor.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/debian/taler-auditor.taler-helper-auditor-wire-credit.service b/debian/taler-auditor.taler-helper-auditor-wire-credit.service
index c6cdfc5de..7d2c93e03 100644
--- a/debian/taler-auditor.taler-helper-auditor-wire-credit.service
+++ b/debian/taler-auditor.taler-helper-auditor-wire-credit.service
@@ -9,7 +9,7 @@ Type=simple
 Restart=always
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-helper-auditor-wire-credit -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-helper-auditor-wire-credit -c /etc/taler-auditor/taler-auditor.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/debian/taler-auditor.taler-helper-auditor-wire-debit.service b/debian/taler-auditor.taler-helper-auditor-wire-debit.service
index 524756da6..65401f54b 100644
--- a/debian/taler-auditor.taler-helper-auditor-wire-debit.service
+++ b/debian/taler-auditor.taler-helper-auditor-wire-debit.service
@@ -9,7 +9,7 @@ Type=simple
 Restart=always
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-helper-auditor-wire-debit -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-helper-auditor-wire-debit -c /etc/taler-auditor/taler-auditor.conf -L INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/debian/taler-exchange-database.install b/debian/taler-exchange-database.install
index da8b0dc47..242782d63 100644
--- a/debian/taler-exchange-database.install
+++ b/debian/taler-exchange-database.install
@@ -3,6 +3,6 @@ usr/bin/taler-exchange-dbinit
 usr/lib/*/taler/libtaler_plugin_exchange*.so
 usr/share/man/man1/taler-exchange-dbconfig.1
 usr/share/man/man1/taler-exchange-dbinit.1
-usr/share/taler/sql/exchange/*
+usr/share/taler-exchange/sql/*
 usr/share/taler/config.d/exchangedb.conf
 usr/share/taler/config.d/exchangedb-postgres.conf
diff --git a/debian/taler-exchange-offline.taler-exchange-offline.service b/debian/taler-exchange-offline.taler-exchange-offline.service
index bd1b93bb3..99b5bcc5f 100644
--- a/debian/taler-exchange-offline.taler-exchange-offline.service
+++ b/debian/taler-exchange-offline.taler-exchange-offline.service
@@ -19,5 +19,5 @@ StandardError=journal
 PrivateTmp=yes
 PrivateDevices=yes
 
-Environment="REGIO_CURRENCY=$(taler-config -s taler -o CURRENCY)"
+Environment="REGIO_CURRENCY=$(taler-exchange-config -s exchange -o CURRENCY)"
 ExecStart=bash -c 'taler-exchange-offline download sign wire-fee now iban "${REGIO_CURRENCY}":0 "${REGIO_CURRENCY}":0 wire-fee now x-taler-bank "${REGIO_CURRENCY}":0 "${REGIO_CURRENCY}":0 global-fee now "${REGIO_CURRENCY}:0" "${REGIO_CURRENCY}:0" "${REGIO_CURRENCY}:0" 4weeks 6years 4 upload'
diff --git a/debian/taler-exchange.install b/debian/taler-exchange.install
index 3ac76f378..7c6ea173b 100644
--- a/debian/taler-exchange.install
+++ b/debian/taler-exchange.install
@@ -1,43 +1,10 @@
-usr/bin/taler-exchange-aggregator
-usr/bin/taler-exchange-closer
-usr/bin/taler-exchange-drain
-usr/bin/taler-exchange-expire
-usr/bin/taler-exchange-httpd
-usr/bin/taler-exchange-kyc-aml-pep-trigger.sh
-usr/bin/taler-exchange-kyc-oauth2-challenger.sh
-usr/bin/taler-exchange-kyc-kycaid-converter.sh
-usr/bin/taler-exchange-helper-measure-test-form
-usr/bin/taler-exchange-kyc-persona-converter.sh
-usr/bin/taler-exchange-router
-usr/bin/taler-exchange-secmod-cs
-usr/bin/taler-exchange-secmod-eddsa
-usr/bin/taler-exchange-secmod-rsa
-usr/bin/taler-exchange-transfer
-usr/bin/taler-exchange-wirewatch
-usr/bin/taler-exchange-wire-gateway-client
-usr/lib/*/taler/libtaler_plugin_kyclogic_*.so
-usr/lib/*/taler/libtaler_extension_*.so
-usr/share/man/man1/taler-exchange-aggregator*
-usr/share/man/man1/taler-exchange-closer*
-usr/share/man/man1/taler-exchange-dbconfig*
-usr/share/man/man1/taler-exchange-dbinit*
-usr/share/man/man1/taler-exchange-drain*
-usr/share/man/man1/taler-exchange-expire*
-usr/share/man/man1/taler-exchange-httpd*
-usr/share/man/man1/taler-exchange-kyc-trigger*
-usr/share/man/man1/taler-exchange-kyc-aml-pep-trigger*
-usr/share/man/man1/taler-exchange-router*
-usr/share/man/man1/taler-exchange-secmod-cs*
-usr/share/man/man1/taler-exchange-secmod-eddsa*
-usr/share/man/man1/taler-exchange-secmod-rsa*
-usr/share/man/man1/taler-exchange-transfer*
-usr/share/man/man1/taler-exchange-wire-gateway-client*
-usr/share/man/man1/taler-exchange-wirewatch*
+usr/bin/taler-exchange-*
+usr/lib/*/taler-exchange/libtaler_plugin_kyclogic_*.so
+usr/lib/*/taler-exchange/libtaler_extension_*.so
+usr/share/man/man1/taler-exchange-*
+usr/share/man/man5/taler-exchange.conf.5
 usr/share/info/taler-exchange*
-usr/share/taler/config.d/*
-usr/share/taler/exchange/templates/*.must
-usr/share/taler/exchange/aml-spa/*
-usr/share/taler/exchange/kyc-spa/*
+usr/share/taler-exchange/*
 
-# configuration files in /etc/taler
+# Debian-specific configuration files for /etc/taler
 debian/etc-taler-exchange/* etc/
diff --git a/debian/taler-exchange.taler-exchange-aggregator.service b/debian/taler-exchange.taler-exchange-aggregator.service
index 84b757eda..f8d195ba2 100644
--- a/debian/taler-exchange.taler-exchange-aggregator.service
+++ b/debian/taler-exchange.taler-exchange-aggregator.service
@@ -10,7 +10,7 @@ Restart=always
 RestartMode=direct
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-exchange-aggregator -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-exchange-aggregator -c /etc/taler-exchange/taler-exchange.conf -L INFO
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=yes
diff --git a/debian/taler-exchange.taler-exchange-aggregator@.service b/debian/taler-exchange.taler-exchange-aggregator@.service
index b13997ae2..c873c018d 100644
--- a/debian/taler-exchange.taler-exchange-aggregator@.service
+++ b/debian/taler-exchange.taler-exchange-aggregator@.service
@@ -14,7 +14,7 @@ Type=simple
 Restart=always
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-exchange-aggregator -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-exchange-aggregator -c /etc/taler-exchange/taler-exchange.conf -L INFO
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=yes
diff --git a/debian/taler-exchange.taler-exchange-closer.service b/debian/taler-exchange.taler-exchange-closer.service
index 9cdc534f9..ef9b9c024 100644
--- a/debian/taler-exchange.taler-exchange-closer.service
+++ b/debian/taler-exchange.taler-exchange-closer.service
@@ -10,7 +10,7 @@ Restart=always
 RestartMode=direct
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-exchange-closer -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-exchange-closer -c /etc/taler-exchange/taler-exchange.conf -L INFO
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=yes
diff --git a/debian/taler-exchange.taler-exchange-expire.service b/debian/taler-exchange.taler-exchange-expire.service
index 2a9552f76..f8227cc13 100644
--- a/debian/taler-exchange.taler-exchange-expire.service
+++ b/debian/taler-exchange.taler-exchange-expire.service
@@ -10,7 +10,7 @@ Restart=always
 RestartMode=direct
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-exchange-expire -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-exchange-expire -c /etc/taler-exchange/taler-exchange.conf -L INFO
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=yes
diff --git a/debian/taler-exchange.taler-exchange-httpd.service b/debian/taler-exchange.taler-exchange-httpd.service
index d7e9b1e36..741ed2795 100644
--- a/debian/taler-exchange.taler-exchange-httpd.service
+++ b/debian/taler-exchange.taler-exchange-httpd.service
@@ -23,7 +23,7 @@ RestartPreventExitStatus=9
 StartLimitBurst=5
 StartLimitInterval=5s
 
-ExecStart=/usr/bin/taler-exchange-httpd -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-exchange-httpd -c /etc/taler-exchange/taler-exchange.conf -L INFO
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=no
diff --git a/debian/taler-exchange.taler-exchange-httpd@.service b/debian/taler-exchange.taler-exchange-httpd@.service
index c4d010b80..d7ba4a1a4 100644
--- a/debian/taler-exchange.taler-exchange-httpd@.service
+++ b/debian/taler-exchange.taler-exchange-httpd@.service
@@ -21,7 +21,7 @@ Restart=always
 RestartSec=1ms
 RestartPreventExitStatus=9
 EnvironmentFile=/etc/environment
-ExecStart=/usr/bin/taler-exchange-httpd -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-exchange-httpd -c /etc/taler-exchange/taler-exchange.conf -L INFO
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=no
diff --git a/debian/taler-exchange.taler-exchange-secmod-cs.service b/debian/taler-exchange.taler-exchange-secmod-cs.service
index b11c04552..0cec3d5ce 100644
--- a/debian/taler-exchange.taler-exchange-secmod-cs.service
+++ b/debian/taler-exchange.taler-exchange-secmod-cs.service
@@ -9,7 +9,7 @@ Type=simple
 Restart=always
 RestartSec=100ms
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-exchange-secmod-cs -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-exchange-secmod-cs -c /etc/taler-exchange/taler-exchange.conf -L INFO
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=no
diff --git a/debian/taler-exchange.taler-exchange-secmod-eddsa.service b/debian/taler-exchange.taler-exchange-secmod-eddsa.service
index 17f1da3f5..ee62766d4 100644
--- a/debian/taler-exchange.taler-exchange-secmod-eddsa.service
+++ b/debian/taler-exchange.taler-exchange-secmod-eddsa.service
@@ -9,7 +9,7 @@ Type=simple
 Restart=always
 RestartSec=100ms
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-exchange-secmod-eddsa -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-exchange-secmod-eddsa -c /etc/taler-exchange/taler-exchange.conf -L INFO
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=no
diff --git a/debian/taler-exchange.taler-exchange-secmod-rsa.service b/debian/taler-exchange.taler-exchange-secmod-rsa.service
index 854737d03..c54df934b 100644
--- a/debian/taler-exchange.taler-exchange-secmod-rsa.service
+++ b/debian/taler-exchange.taler-exchange-secmod-rsa.service
@@ -9,7 +9,7 @@ Type=simple
 Restart=always
 RestartSec=100ms
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-exchange-secmod-rsa -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-exchange-secmod-rsa -c /etc/taler-exchange/taler-exchange.conf -L INFO
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=no
diff --git a/debian/taler-exchange.taler-exchange-transfer.service b/debian/taler-exchange.taler-exchange-transfer.service
index 77ada8f86..67e2bea03 100644
--- a/debian/taler-exchange.taler-exchange-transfer.service
+++ b/debian/taler-exchange.taler-exchange-transfer.service
@@ -10,7 +10,7 @@ Restart=always
 RestartMode=direct
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-exchange-transfer -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-exchange-transfer -c /etc/taler-exchange/taler-exchange.conf -L INFO
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=yes
diff --git a/debian/taler-exchange.taler-exchange-wirewatch.service b/debian/taler-exchange.taler-exchange-wirewatch.service
index 7a7dc60b0..a0c401ddc 100644
--- a/debian/taler-exchange.taler-exchange-wirewatch.service
+++ b/debian/taler-exchange.taler-exchange-wirewatch.service
@@ -11,7 +11,7 @@ RestartMode=direct
 RestartSec=1s
 RestartPreventExitStatus=9
 RuntimeMaxSec=3600s
-ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler-exchange/taler-exchange.conf -L INFO
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=yes
diff --git a/debian/taler-exchange.taler-exchange-wirewatch@.service b/debian/taler-exchange.taler-exchange-wirewatch@.service
index a2836c6b9..58a76cc14 100644
--- a/debian/taler-exchange.taler-exchange-wirewatch@.service
+++ b/debian/taler-exchange.taler-exchange-wirewatch@.service
@@ -15,7 +15,7 @@ Type=simple
 Restart=always
 RestartSec=1s
 RestartPreventExitStatus=9
-ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf -L INFO
+ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler-exchange/taler-exchange.conf -L INFO
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=yes
diff --git a/debian/taler-terms-generator.install b/debian/taler-terms-generator.install
index 19972ffc7..f4c8da583 100644
--- a/debian/taler-terms-generator.install
+++ b/debian/taler-terms-generator.install
@@ -2,7 +2,7 @@ usr/share/man/man1/taler-terms-generator.1
 usr/bin/taler-terms-generator
 
 # Terms of service / privacy policy templates
-usr/share/taler/terms/*.rst
+usr/share/taler-exchange/terms/*.rst
 
 # Translations of ToS/PP
 usr/share/locale/*/LC_MESSAGES/*.po