merchant

commit 80b8e221fe2233050e33400fac032d37ac73f731
parent af1ec2705ca4458ad19cfadada85bb70354c9d4b
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Thu, 14 Aug 2025 15:27:30 +0200

do not use variablenames for usernames/groupnames as suggested by Florian

Diffstat:
M
debian/taler-merchant.postinst
 | 
8
+++-----
M
debian/taler-merchant.postrm
 | 
8
+++-----

2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/debian/taler-merchant.postinst b/debian/taler-merchant.postinst
@@ -44,9 +44,7 @@ if [ "$1" = "purge" ]; then
         fi
 fi
 
-TALER_HOME="/var/lib/taler"
-_USERNAME=taler-merchant-httpd
-_GROUPNAME=www-data
+TALER_HOME="/var/lib/taler-merchant"
 
 . /usr/share/debconf/confmodule
 
@@ -54,8 +52,8 @@ case "${1}" in
 configure)
 
   # Creating taler users if needed
-  if ! getent passwd ${_USERNAME} >/dev/null; then
-    adduser --quiet --system --ingroup ${_GROUPNAME} --no-create-home --home ${TALER_HOME} ${_USERNAME}
+  if ! getent passwd taler-merchant-httpd >/dev/null; then
+    adduser --quiet --system --ingroup www-data --no-create-home --home ${TALER_HOME} taler-merchant-httpd
   fi
 
   if ! dpkg-statoverride --list /etc/taler-merchant/secrets/merchant-db.secret.conf >/dev/null 2>&1
diff --git a/debian/taler-merchant.postrm b/debian/taler-merchant.postrm
@@ -2,10 +2,8 @@
 
 set -e
 
-_USERNAME=taler-merchant-httpd
-
-
-if [ -f /usr/share/debconf/confmodule ]; then
+if [ -f /usr/share/debconf/confmodule ];
+then
   . /usr/share/debconf/confmodule
 fi
 
@@ -13,7 +11,7 @@ case "${1}" in
 purge)
     dpkg-statoverride --remove \
        /etc/taler-merchant/secrets/merchant-db.secret.conf || true
-    deluser --quiet --system ${_USERNAME} || true
+    deluser --quiet --system taler-merchant-httpd || true
     ;;
 
 remove | upgrade | failed-upgrade | abort-install | abort-upgrade | disappear)