adjust various paths for config splitv0.14.1-dev.12

21 files changed, 40 insertions, 40 deletions

diff --git a/contrib/packages/fedora/taler-exchange.taler-exchange-httpd@.service b/contrib/packages/fedora/taler-exchange.taler-exchange-httpd@.service
index e0246899c..8c5632ebb 100644
--- a/contrib/packages/fedora/taler-exchange.taler-exchange-httpd@.service
+++ b/contrib/packages/fedora/taler-exchange.taler-exchange-httpd@.service
@@ -1,7 +1,7 @@
 % This is a systemd service template.
 [Unit]
 Description=GNU Taler payment system exchange REST API at %I
-AssertPathExists=/run/taler/exchange-httpd
+AssertPathExists=/run/taler-exchange/httpd
 Requires=taler-exchange-httpd@%i.socket taler-exchange-secmod-rsa.service taler-exchange-secmod-eddsa.service
 After=postgres.service network.target taler-exchange-secmod-rsa.service taler-exchange-secmod-eddsa.service
 PartOf=taler-exchange.target
diff --git a/debian/etc-taler-exchange/apache2/sites-available/taler-exchange.conf b/debian/etc-taler-exchange/apache2/sites-available/taler-exchange.conf
index 3ec14feb2..ebadd5f9a 100644
--- a/debian/etc-taler-exchange/apache2/sites-available/taler-exchange.conf
+++ b/debian/etc-taler-exchange/apache2/sites-available/taler-exchange.conf
@@ -1,4 +1,4 @@
 <Location "/taler-exchange/">
-ProxyPass "unix:/run/taler/exchange-httpd/exchange-http.sock|http://example.com/"
+ProxyPass "unix:/run/taler-exchange/httpd/exchange-http.sock|http://example.com/"
 RequestHeader add "X-Forwarded-Proto" "https"
 </Location>
diff --git a/debian/etc-taler-exchange/nginx/sites-available/taler-exchange b/debian/etc-taler-exchange/nginx/sites-available/taler-exchange
index 9b61a32df..6e98eb2ff 100644
--- a/debian/etc-taler-exchange/nginx/sites-available/taler-exchange
+++ b/debian/etc-taler-exchange/nginx/sites-available/taler-exchange
@@ -8,7 +8,7 @@ server {
   error_log /var/log/nginx/exchange.err;
 
   location /taler-exchange/ {
-     proxy_pass http://unix:/run/taler/exchange-httpd/exchange-http.sock:/;
+     proxy_pass http://unix:/run/taler-exchange/httpd/exchange-http.sock:/;
      proxy_redirect off;
      proxy_set_header Host $host;
      proxy_set_header X-Forwarded-Host "localhost";
diff --git a/debian/libtalerexchange.dirs b/debian/libtalerexchange.dirs
index 6b2cf9385..fa944aa24 100644
--- a/debian/libtalerexchange.dirs
+++ b/debian/libtalerexchange.dirs
@@ -1 +1 @@
-/var/lib/taler
+/var/lib/taler-exchange
diff --git a/debian/libtalerexchange.postinst b/debian/libtalerexchange.postinst
index 40b4be061..421b8bf45 100644
--- a/debian/libtalerexchange.postinst
+++ b/debian/libtalerexchange.postinst
@@ -7,10 +7,10 @@ set -e
 case "${1}" in
 configure)
 
-  if ! dpkg-statoverride --list /etc/taler/taler.conf >/dev/null 2>&1; then
+  if ! dpkg-statoverride --list /etc/taler-exchange/taler-exchange.conf >/dev/null 2>&1; then
     dpkg-statoverride --add --update \
       root root 644 \
-      /etc/taler/taler.conf
+      /etc/taler-exchange/taler-exchange.conf
   fi
 
   ;;
diff --git a/debian/libtalerexchange.tmpfiles b/debian/libtalerexchange.tmpfiles
index dcac0ba87..229b53fd7 100644
--- a/debian/libtalerexchange.tmpfiles
+++ b/debian/libtalerexchange.tmpfiles
@@ -1,2 +1,2 @@
 #Type Path        Mode UID  GID  Age Argument
-d /run/taler 0755 root root  - -
+d /run/taler-exchange 0755 root root  - -
diff --git a/debian/taler-auditor.postinst b/debian/taler-auditor.postinst
index e624c6df3..2ae111874 100644
--- a/debian/taler-auditor.postinst
+++ b/debian/taler-auditor.postinst
@@ -17,11 +17,11 @@ function mark_secret() {
 
 case "${1}" in
 configure)
-  # Creating taler groups as needed
+  # Create taler groups as needed
   if ! getent group ${_GROUPNAME} >/dev/null; then
     addgroup --quiet --system ${_GROUPNAME}
   fi
-  # Creating taler users if needed
+  # Create taler users if needed
   if ! getent passwd ${_USERNAME} >/dev/null; then
     adduser --quiet --system --ingroup ${_GROUPNAME} --no-create-home --home ${TALER_HOME} ${_USERNAME}
   fi
diff --git a/debian/taler-auditor.tmpfiles b/debian/taler-auditor.tmpfiles
index 8201632ca..3ec2020e6 100644
--- a/debian/taler-auditor.tmpfiles
+++ b/debian/taler-auditor.tmpfiles
@@ -1,2 +1,2 @@
 #Type Path        Mode UID  GID  Age Argument
-d /run/taler/auditor-httpd 0750 taler-auditor-httpd www-data  - -
+d /run/taler-auditor/auditor-httpd 0750 taler-auditor-httpd www-data  - -
diff --git a/debian/taler-exchange-offline.tmpfiles b/debian/taler-exchange-offline.tmpfiles
index 5f9dcb011..ad7857acf 100644
--- a/debian/taler-exchange-offline.tmpfiles
+++ b/debian/taler-exchange-offline.tmpfiles
@@ -1,2 +1,2 @@
 #Type Path        Mode UID  GID  Age Argument
-d /var/lib/taler/exchange-offline 0700 taler-exchange-offline taler-exchange-offline  - -
+d /var/lib/taler-exchange/offline 0700 taler-exchange-offline taler-exchange-offline  - -
diff --git a/debian/taler-exchange.postinst b/debian/taler-exchange.postinst
index 74d4754a2..a44026898 100644
--- a/debian/taler-exchange.postinst
+++ b/debian/taler-exchange.postinst
@@ -4,7 +4,7 @@ set -e
 
 . /usr/share/debconf/confmodule
 
-TALER_HOME="/var/lib/taler"
+TALER_HOME="/var/lib/taler-exchange"
 _GROUPNAME=taler-exchange-secmod
 _DBGROUPNAME=taler-exchange-db
 _EUSERNAME=taler-exchange-httpd
diff --git a/debian/taler-exchange.postrm b/debian/taler-exchange.postrm
index fcde84b58..bbac0a8d5 100644
--- a/debian/taler-exchange.postrm
+++ b/debian/taler-exchange.postrm
@@ -20,11 +20,11 @@ fi
 
 case "${1}" in
 purge)
-    rm -rf /var/lib/taler/exchange-offline /var/lib/taler/exchange-secmod-*
+    rm -rf /var/lib/taler-exchange/secmod-*
     dpkg-statoverride --remove \
-       /etc/taler/secrets/exchange-accountcredentials-1.secret.conf || true
+       /etc/taler-exchange/secrets/exchange-accountcredentials-1.secret.conf || true
     dpkg-statoverride --remove \
-                      /etc/taler/secrets/exchange-db.secret.conf || true
+                      /etc/taler-exchange/secrets/exchange-db.secret.conf || true
     deluser --quiet --system ${_CSECUSERNAME} || true
     deluser --quiet --system ${_RSECUSERNAME} || true
     deluser --quiet --system ${_ESECUSERNAME} || true
diff --git a/debian/taler-exchange.taler-exchange-httpd.service b/debian/taler-exchange.taler-exchange-httpd.service
index 741ed2795..5c70511a4 100644
--- a/debian/taler-exchange.taler-exchange-httpd.service
+++ b/debian/taler-exchange.taler-exchange-httpd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=GNU Taler payment system exchange REST API
-AssertPathExists=/run/taler/exchange-httpd
+AssertPathExists=/run/taler-exchange/httpd
 Requires=taler-exchange-httpd.socket taler-exchange-secmod-cs.service taler-exchange-secmod-rsa.service taler-exchange-secmod-eddsa.service
 After=postgres.service network.target taler-exchange-secmod-cs.service taler-exchange-secmod-rsa.service taler-exchange-secmod-eddsa.service
 PartOf=taler-exchange.target
diff --git a/debian/taler-exchange.taler-exchange-httpd.socket b/debian/taler-exchange.taler-exchange-httpd.socket
index adbfb931b..b9efc4934 100644
--- a/debian/taler-exchange.taler-exchange-httpd.socket
+++ b/debian/taler-exchange.taler-exchange-httpd.socket
@@ -3,7 +3,7 @@ Description=Taler Exchange Socket
 PartOf=taler-exchange-httpd.service
 
 [Socket]
-ListenStream=/run/taler/exchange-httpd/exchange-http.sock
+ListenStream=/run/taler-exchange/httpd/exchange-http.sock
 Accept=no
 Service=taler-exchange-httpd.service
 SocketUser=taler-exchange-httpd
diff --git a/debian/taler-exchange.taler-exchange-httpd@.service b/debian/taler-exchange.taler-exchange-httpd@.service
index d7ba4a1a4..4d5adb249 100644
--- a/debian/taler-exchange.taler-exchange-httpd@.service
+++ b/debian/taler-exchange.taler-exchange-httpd@.service
@@ -6,7 +6,7 @@
 
 [Unit]
 Description=GNU Taler payment system exchange REST API at %I
-AssertPathExists=/run/taler/exchange-httpd
+AssertPathExists=/run/taler-exchange/httpd
 Requires=taler-exchange-httpd@%i.socket taler-exchange-secmod-rsa.service taler-exchange-secmod-eddsa.service
 After=postgres.service network.target taler-exchange-secmod-rsa.service taler-exchange-secmod-eddsa.service
 PartOf=taler-exchange.target
diff --git a/debian/taler-exchange.taler-exchange-secmod-cs.service b/debian/taler-exchange.taler-exchange-secmod-cs.service
index 0cec3d5ce..d69f7dcbf 100644
--- a/debian/taler-exchange.taler-exchange-secmod-cs.service
+++ b/debian/taler-exchange.taler-exchange-secmod-cs.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=GNU Taler payment system exchange CS security module
-AssertPathExists=/run/taler/exchange-secmod-cs
+AssertPathExists=/run/taler-exchange/secmod-cs
 PartOf=taler-exchange.target
 
 [Service]
diff --git a/debian/taler-exchange.taler-exchange-secmod-eddsa.service b/debian/taler-exchange.taler-exchange-secmod-eddsa.service
index ee62766d4..aa7bda2ab 100644
--- a/debian/taler-exchange.taler-exchange-secmod-eddsa.service
+++ b/debian/taler-exchange.taler-exchange-secmod-eddsa.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=GNU Taler payment system exchange EdDSA security module
-AssertPathExists=/run/taler/exchange-secmod-eddsa
+AssertPathExists=/run/taler-exchange/secmod-eddsa
 PartOf=taler-exchange.target
 
 [Service]
diff --git a/debian/taler-exchange.taler-exchange-secmod-rsa.service b/debian/taler-exchange.taler-exchange-secmod-rsa.service
index c54df934b..adb39594f 100644
--- a/debian/taler-exchange.taler-exchange-secmod-rsa.service
+++ b/debian/taler-exchange.taler-exchange-secmod-rsa.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=GNU Taler payment system exchange RSA security module
-AssertPathExists=/run/taler/exchange-secmod-rsa
+AssertPathExists=/run/taler-exchange/secmod-rsa
 PartOf=taler-exchange.target
 
 [Service]
diff --git a/debian/taler-exchange.tmpfiles b/debian/taler-exchange.tmpfiles
index c2a796539..0f5d38333 100644
--- a/debian/taler-exchange.tmpfiles
+++ b/debian/taler-exchange.tmpfiles
@@ -1,8 +1,8 @@
 #Type Path        Mode UID  GID  Age Argument
-d /run/taler/exchange-secmod-rsa 0755 taler-exchange-secmod-rsa taler-exchange-secmod  - -
-d /run/taler/exchange-secmod-cs 0755 taler-exchange-secmod-cs taler-exchange-secmod  - -
-d /run/taler/exchange-secmod-eddsa 0755 taler-exchange-secmod-eddsa taler-exchange-secmod  - -
-d /run/taler/exchange-httpd 0750 taler-exchange-httpd www-data  - -
-d /var/lib/taler/exchange-secmod-cs 0700 taler-exchange-secmod-cs taler-exchange-secmod  - -
-d /var/lib/taler/exchange-secmod-rsa 0700 taler-exchange-secmod-rsa taler-exchange-secmod  - -
-d /var/lib/taler/exchange-secmod-eddsa 0700 taler-exchange-secmod-eddsa taler-exchange-secmod  - -
+d /run/taler-exchange/secmod-rsa 0755 taler-exchange-secmod-rsa taler-exchange-secmod  - -
+d /run/taler-exchange/secmod-cs 0755 taler-exchange-secmod-cs taler-exchange-secmod  - -
+d /run/taler-exchange/secmod-eddsa 0755 taler-exchange-secmod-eddsa taler-exchange-secmod  - -
+d /run/taler-exchange/httpd 0750 taler-exchange-httpd www-data  - -
+d /var/lib/taler-exchange/secmod-cs 0700 taler-exchange-secmod-cs taler-exchange-secmod  - -
+d /var/lib/taler-exchange/secmod-rsa 0700 taler-exchange-secmod-rsa taler-exchange-secmod  - -
+d /var/lib/taler-exchange/secmod-eddsa 0700 taler-exchange-secmod-eddsa taler-exchange-secmod  - -
diff --git a/src/util/taler-exchange-secmod-cs.conf b/src/util/taler-exchange-secmod-cs.conf
index fa3cdba40..96881fb28 100644
--- a/src/util/taler-exchange-secmod-cs.conf
+++ b/src/util/taler-exchange-secmod-cs.conf
@@ -8,16 +8,16 @@
 OVERLAP_DURATION = 5 m
 
 # Where do we store the generated private keys.
-KEY_DIR = ${TALER_DATA_HOME}exchange-secmod-cs/keys
+KEY_DIR = ${TALER_DATA_HOME}secmod-cs/keys
 
 # Where does the helper listen for requests?
-UNIXPATH = ${TALER_RUNTIME_DIR}exchange-secmod-cs/server.sock
+UNIXPATH = ${TALER_RUNTIME_DIR}secmod-cs/server.sock
 
 # Directory for clients.
-CLIENT_DIR = ${TALER_RUNTIME_DIR}exchange-secmod-cs/clients
+CLIENT_DIR = ${TALER_RUNTIME_DIR}secmod-cs/clients
 
 # Where should the security module store its own private key?
-SM_PRIV_KEY = ${TALER_DATA_HOME}exchange-secmod-cs/secmod-private-key
+SM_PRIV_KEY = ${TALER_DATA_HOME}secmod-cs/secmod-private-key
 
 # For how long into the future do we pre-generate keys?
 LOOKAHEAD_SIGN = 1 year
diff --git a/src/util/taler-exchange-secmod-eddsa.conf b/src/util/taler-exchange-secmod-eddsa.conf
index 0cb4a4ffc..54fcb3f56 100644
--- a/src/util/taler-exchange-secmod-eddsa.conf
+++ b/src/util/taler-exchange-secmod-eddsa.conf
@@ -8,16 +8,16 @@
 OVERLAP_DURATION = 5m
 
 # Where do we store the private keys.
-KEY_DIR = ${TALER_DATA_HOME}exchange-secmod-eddsa/keys
+KEY_DIR = ${TALER_DATA_HOME}secmod-eddsa/keys
 
 # Where does the helper listen for requests?
-UNIXPATH = ${TALER_RUNTIME_DIR}exchange-secmod-eddsa/server.sock
+UNIXPATH = ${TALER_RUNTIME_DIR}secmod-eddsa/server.sock
 
 # Directory for clients.
-CLIENT_DIR = ${TALER_RUNTIME_DIR}exchange-secmod-eddsa/clients
+CLIENT_DIR = ${TALER_RUNTIME_DIR}secmod-eddsa/clients
 
 # Where should the security module store its own private key?
-SM_PRIV_KEY = ${TALER_DATA_HOME}exchange-secmod-eddsa/secmod-private-key
+SM_PRIV_KEY = ${TALER_DATA_HOME}secmod-eddsa/secmod-private-key
 
 # For how long into the future do we pre-generate keys?
 LOOKAHEAD_SIGN = 1 year
diff --git a/src/util/taler-exchange-secmod-rsa.conf b/src/util/taler-exchange-secmod-rsa.conf
index 978c40258..f20cf724b 100644
--- a/src/util/taler-exchange-secmod-rsa.conf
+++ b/src/util/taler-exchange-secmod-rsa.conf
@@ -8,16 +8,16 @@
 OVERLAP_DURATION = 0 m
 
 # Where do we store the generated private keys.
-KEY_DIR = ${TALER_DATA_HOME}exchange-secmod-rsa/keys
+KEY_DIR = ${TALER_DATA_HOME}secmod-rsa/keys
 
 # Where does the helper listen for requests?
-UNIXPATH = ${TALER_RUNTIME_DIR}exchange-secmod-rsa/server.sock
+UNIXPATH = ${TALER_RUNTIME_DIR}secmod-rsa/server.sock
 
 # Directory for clients.
-CLIENT_DIR = ${TALER_RUNTIME_DIR}exchange-secmod-rsa/clients
+CLIENT_DIR = ${TALER_RUNTIME_DIR}secmod-rsa/clients
 
 # Where should the security module store its own private key?
-SM_PRIV_KEY = ${TALER_DATA_HOME}exchange-secmod-rsa/secmod-private-key
+SM_PRIV_KEY = ${TALER_DATA_HOME}secmod-rsa/secmod-private-key
 
 # For how long into the future do we pre-generate keys?
 LOOKAHEAD_SIGN = 1 year