summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/libtalerexchange-dev.docs2
-rw-r--r--debian/libtalerexchange-dev.install2
-rw-r--r--debian/libtalerexchange.install3
-rw-r--r--debian/taler-exchange.postinst14
-rw-r--r--debian/taler-exchange.postrm4
-rw-r--r--debian/taler-exchange.templates8
6 files changed, 13 insertions, 20 deletions
diff --git a/debian/libtalerexchange-dev.docs b/debian/libtalerexchange-dev.docs
deleted file mode 100644
index 6f12db508..000000000
--- a/debian/libtalerexchange-dev.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-AUTHORS
-README
diff --git a/debian/libtalerexchange-dev.install b/debian/libtalerexchange-dev.install
deleted file mode 100644
index 146a60371..000000000
--- a/debian/libtalerexchange-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include
-usr/lib/*/*.so
diff --git a/debian/libtalerexchange.install b/debian/libtalerexchange.install
deleted file mode 100644
index beef729b3..000000000
--- a/debian/libtalerexchange.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/taler-config
-usr/lib/*/*.so.*
-usr/share/
diff --git a/debian/taler-exchange.postinst b/debian/taler-exchange.postinst
index 48ebd6be1..9bad800d7 100644
--- a/debian/taler-exchange.postinst
+++ b/debian/taler-exchange.postinst
@@ -13,10 +13,10 @@ case "${1}" in
_EUSERNAME="${RET:-taler-exchange-httpd}"
db_get taler-exchange/rsecusername
- _RSECUSERNAME="${RET:-taler-exchange-helper-rsa}"
+ _RSECUSERNAME="${RET:-taler-exchange-secmod-rsa}"
db_get taler-exchange/esecusername
- _ESECUSERNAME="${RET:-taler-exchange-helper-eddsa}"
+ _ESECUSERNAME="${RET:-taler-exchange-secmod-eddsa}"
db_get taler-exchange/wireusername
_WIREUSERNAME="${RET:-taler-exchange-wire}"
@@ -60,13 +60,13 @@ case "${1}" in
if ! getent passwd ${_RSECUSERNAME} > /dev/null
then
echo -n "Creating new Taler user ${_RSECUSERNAME}:"
- adduser --quiet --system --ingroup ${_GROUPNAME} --home ${TALER_HOME}/helper-rsa ${_RSECUSERNAME}
+ adduser --quiet --system --ingroup ${_GROUPNAME} --home ${TALER_HOME}/secmod-rsa ${_RSECUSERNAME}
echo " done."
fi
if ! getent passwd ${_ESECUSERNAME} > /dev/null
then
echo -n "Creating new Taler user ${_ESECUSERNAME}:"
- adduser --quiet --system --ingroup ${_GROUPNAME} --home ${TALER_HOME}/helper-eddsa ${_ESECUSERNAME}
+ adduser --quiet --system --ingroup ${_GROUPNAME} --home ${TALER_HOME}/secmod-eddsa ${_ESECUSERNAME}
echo " done."
fi
if ! getent passwd ${_WIREUSERNAME} > /dev/null
@@ -104,7 +104,7 @@ EOF
cat > "/etc/systemd/system/taler-exchange-httpd.service" <<EOF
[Unit]
Description=GNU Taler payment system exchange REST API
-Requires=taler-exchange-helper-rsa.service taler-exchange-helper-eddsa.service
+Requires=taler-exchange-secmod-rsa.service taler-exchange-secmod-eddsa.service
Wants=taler-exchange-wirewatch taler-exchange-aggregator taler-exchange-transfer
After=postgres.service network.target
@@ -119,7 +119,7 @@ ExecStart=/usr/bin/taler-exchange-httpd -c /etc/taler-exchange.conf
WantedBy=multi-user.target
EOF
-cat > "/etc/systemd/system/taler-exchange-helper-rsa.service" <<EOF
+cat > "/etc/systemd/system/taler-exchange-secmod-rsa.service" <<EOF
[Unit]
Description=GNU Taler payment system exchange RSA security module
@@ -133,7 +133,7 @@ ExecStart=/usr/bin/taler-exchange-secmod-rsa -c /etc/taler-exchange.conf
[Install]
WantedBy=multi-user.target
EOF
-cat > "/etc/systemd/system/taler-exchange-helper-eddsa.service" <<EOF
+cat > "/etc/systemd/system/taler-exchange-secmod-eddsa.service" <<EOF
[Unit]
Description=GNU Taler payment system exchange EdDSA security module
diff --git a/debian/taler-exchange.postrm b/debian/taler-exchange.postrm
index b2d132cfd..8a5a007b9 100644
--- a/debian/taler-exchange.postrm
+++ b/debian/taler-exchange.postrm
@@ -28,10 +28,10 @@ case "${1}" in
_EUSERNAME="${RET:-taler-exchange-httpd}"
db_get taler-exchange/rsecusername
- _RSECUSERNAME="${RET:-taler-exchange-helper-rsa}"
+ _RSECUSERNAME="${RET:-taler-exchange-secmod-rsa}"
db_get taler-exchange/esecusername
- _ESECUSERNAME="${RET:-taler-exchange-helper-eddsa}"
+ _ESECUSERNAME="${RET:-taler-exchange-secmod-eddsa}"
db_get taler-exchange/wireusername
_WIREUSERNAME="${RET:-taler-exchange-wire}"
diff --git a/debian/taler-exchange.templates b/debian/taler-exchange.templates
index 43c3524e4..9428bec22 100644
--- a/debian/taler-exchange.templates
+++ b/debian/taler-exchange.templates
@@ -9,18 +9,18 @@ _Description: Taler user:
Template: taler-exchange/rsecusername
Type: string
-Default: taler-exchange-helper-rsa
+Default: taler-exchange-secmod-rsa
_Description: Taler user:
- Please choose the user that the taler-exchange-helper-rsa process will run as.
+ Please choose the user that the taler-exchange-secmod-rsa process will run as.
.
This should be a dedicated account. If the specified account does not
already exist, it will automatically be created, with no login shell.
Template: taler-exchange/esecusername
Type: string
-Default: taler-exchange-helper-eddsa
+Default: taler-exchange-secmod-eddsa
_Description: Taler user:
- Please choose the user that the taler-exchange-helper-eddsa process will run as.
+ Please choose the user that the taler-exchange-secmod-eddsa process will run as.
.
This should be a dedicated account. If the specified account does not
already exist, it will automatically be created, with no login shell.