commit 652e97b933b18cd56db613944de5d4ad6613a4a1
parent e646ddcd3eaebf9b3a444f5fb4ae8da3ac87f162
Author: Christian Grothoff <grothoff@gnunet.org>
Date: Thu, 25 Sep 2025 12:45:36 +0200
clean up debian package rules, may help with #10453
Diffstat:
6 files changed, 145 insertions(+), 106 deletions(-)
diff --git a/debian/taler-auditor.postinst b/debian/taler-auditor.postinst
@@ -1,42 +1,47 @@
-#!/bin/bash
+#!/bin/sh
set -e
-. /usr/share/debconf/confmodule
-
-CONFIG_FILE="/etc/default/taler-auditor"
-TALER_HOME="/var/lib/taler-auditor"
-
-function mark_secret() {
- if ! dpkg-statoverride --list "$1" >/dev/null 2>&1;
- then
- dpkg-statoverride --add --update taler-auditor-httpd taler-auditor-httpd 640 "$1"
- fi
-}
-
case "${1}" in
configure)
- # Create taler groups as needed
if ! getent group taler-auditor-httpd >/dev/null;
then
addgroup --quiet --system taler-auditor-httpd
fi
- # Create taler users if needed
if ! getent passwd taler-auditor-httpd >/dev/null;
then
- adduser --quiet --system --ingroup taler-auditor-httpd --no-create-home --home ${TALER_HOME} taler-auditor-httpd
+ adduser --quiet \
+ --system \
+ --ingroup taler-auditor-httpd \
+ --no-create-home \
+ --home /var/lib/taler-auditor \
+ taler-auditor-httpd
fi
- mark_secret /etc/taler-auditor/secrets/auditor-db.secret.conf
- mark_secret /etc/taler-auditor/secrets/exchange-accountcredentials-1.secret.conf
+ if ! dpkg-statoverride --list /etc/taler-auditor/secrets/auditor-db.secret.conf >/dev/null 2>&1;
+ then
+ dpkg-statoverride --add \
+ --update \
+ taler-auditor-httpd taler-auditor-httpd \
+ 640 \
+ /etc/taler-auditor/secrets/auditor-db.secret.conf
+ fi
+ if ! dpkg-statoverride --list /etc/taler-auditor/secrets/exchange-accountcredentials-1.secret.conf >/dev/null 2>&1;
+ then
+ dpkg-statoverride --add \
+ --update \
+ taler-auditor-httpd taler-auditor-httpd \
+ 640 \
+ /etc/taler-auditor/secrets/exchange-accountcredentials-1.secret.conf
+ fi
- # Try to generate compressed versions of the SPA
- for n in index.css index.js index.html
- do
- TDIR="/usr/share/taler-auditor/"
- gzip --best - < "${TDIR}/spa/$n" > "${TDIR}/spa/$n.gz" || rm -f "${TDIR}/spa/$n.gz"
- zstd -19 - < "${TDIR}/spa/$n" > "${TDIR}/spa/$n.zstd" || rm -f "${TDIR}/spa/$n.zstd"
- done
+ # Try to generate compressed versions of the SPA
+ for n in index.css index.js index.html
+ do
+ TDIR="/usr/share/taler-auditor/"
+ gzip --best - < "${TDIR}/spa/$n" > "${TDIR}/spa/$n.gz" || true
+ zstd -19 - < "${TDIR}/spa/$n" > "${TDIR}/spa/$n.zstd" || true
+ done
;;
abort-upgrade | abort-remove | abort-deconfigure) ;;
@@ -46,6 +51,4 @@ abort-upgrade | abort-remove | abort-deconfigure) ;;
;;
esac
-#DEBHELPER#
-
exit 0
diff --git a/debian/taler-auditor.postrm b/debian/taler-auditor.postrm
@@ -2,18 +2,18 @@
set -e
-if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
-fi
-
case "${1}" in
purge)
dpkg-statoverride --remove \
/etc/taler-auditor/secrets/auditor-db.secret.conf || true
dpkg-statoverride --remove \
/etc/taler-auditor/secrets/exchange-accountcredentials-1.secret.conf || true
- deluser --system --quiet taler-auditor-httpd || true
- delgroup --only-if-empty --quiet taler-auditor-httpd || true
+ deluser --system \
+ --quiet \
+ taler-auditor-httpd || true
+ delgroup --only-if-empty \
+ --quiet \
+ taler-auditor-httpd || true
;;
remove | upgrade | failed-upgrade | abort-install | abort-upgrade | disappear) ;;
@@ -23,6 +23,4 @@ remove | upgrade | failed-upgrade | abort-install | abort-upgrade | disappear) ;
;;
esac
-#DEBHELPER#
-
exit 0
diff --git a/debian/taler-auditor.prerm b/debian/taler-auditor.prerm
@@ -2,14 +2,10 @@
set -e
-if [ -f /usr/share/debconf/confmodule ];
+if [ -d /run/systemd/system ] && [ "$1" = remove ];
then
- . /usr/share/debconf/confmodule
-fi
-
-if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
- deb-systemd-invoke stop 'taler-auditor.target' >/dev/null || true
- deb-systemd-invoke stop 'taler-auditor.slice' >/dev/null || true
+ deb-systemd-invoke stop 'taler-auditor.target' >/dev/null || true
+ deb-systemd-invoke stop 'taler-auditor.slice' >/dev/null || true
fi
exit 0
diff --git a/debian/taler-exchange.postinst b/debian/taler-exchange.postinst
@@ -2,78 +2,134 @@
set -e
-. /usr/share/debconf/confmodule
-
TALER_HOME="/var/lib/taler-exchange"
case "${1}" in
configure)
- # Create taler groups as needed
- if ! getent group taler-exchange-secmod >/dev/null; then
- addgroup --quiet --system taler-exchange-secmod
+ if ! getent group taler-exchange-secmod >/dev/null;
+ then
+ addgroup --quiet --system taler-exchange-secmod
fi
- if ! getent group taler-exchange-db >/dev/null; then
- addgroup --quiet --system taler-exchange-db
+ if ! getent group taler-exchange-db >/dev/null;
+ then
+ addgroup --quiet --system taler-exchange-db
fi
- if ! getent group taler-exchange-kyc >/dev/null; then
- addgroup --quiet --system taler-exchange-kyc
+ if ! getent group taler-exchange-kyc >/dev/null;
+ then
+ addgroup --quiet --system taler-exchange-kyc
fi
# Create taler users if needed
- if ! getent passwd taler-exchange-httpd >/dev/null; then
- adduser --quiet --system --no-create-home --ingroup taler-exchange-secmod --home ${TALER_HOME} taler-exchange-httpd
- adduser --quiet taler-exchange-httpd taler-exchange-db
- adduser --quiet taler-exchange-httpd taler-exchange-kyc
- adduser --quiet taler-exchange-httpd taler-exchange-secmod
+ if ! getent passwd taler-exchange-httpd >/dev/null;
+ then
+ adduser --quiet \
+ --system \
+ --no-create-home \
+ --ingroup taler-exchange-secmod \
+ --home ${TALER_HOME} \
+ taler-exchange-httpd
+ adduser --quiet taler-exchange-httpd taler-exchange-db
+ adduser --quiet taler-exchange-httpd taler-exchange-kyc
+ adduser --quiet taler-exchange-httpd taler-exchange-secmod
fi
- if ! getent passwd taler-exchange-sanctionscheck >/dev/null; then
- adduser --quiet --system --ingroup taler-exchange-db --home /var/lib/taler-sanctionscheck taler-exchange-sanctionscheck
+ if ! getent passwd taler-exchange-sanctionscheck >/dev/null;
+ then
+ adduser --quiet \
+ --system \
+ --ingroup taler-exchange-secmod \
+ --home /var/lib/taler-sanctionscheck \
+ taler-exchange-sanctionscheck
+ adduser --quiet taler-exchange-sanctionscheck taler-exchange-db
adduser --quiet taler-exchange-sanctionscheck taler-exchange-kyc
fi
- if ! getent passwdtaler-exchange-secmod-rsadev/null; then
- adduser --quiet --system --no-create-home --ingroup taler-exchange-secmod --home ${TALER_HOME} taler-exchange-secmod-rsa
+ if ! getent passwd taler-exchange-secmod-rsa >/dev/null;
+ then
+ adduser --quiet \
+ --system \
+ --no-create-home \
+ --ingroup taler-exchange-secmod \
+ --home ${TALER_HOME} \
+ taler-exchange-secmod-rsa
fi
- if ! getent passwd taler-exchange-secmod-cs >/dev/null; then
- adduser --quiet --system --no-create-home --ingroup taler-exchange-secmod --home ${TALER_HOME} taler-exchange-secmod-cs
+ if ! getent passwd taler-exchange-secmod-cs >/dev/null;
+ then
+ adduser --quiet \
+ --system \
+ --no-create-home \
+ --ingroup taler-exchange-secmod \
+ --home ${TALER_HOME} \
+ taler-exchange-secmod-cs
fi
- if ! getent passwd taler-exchange-secmod-eddsa >/dev/null; then
- adduser --quiet --system --no-create-home --ingroup taler-exchange-secmod --home ${TALER_HOME} taler-exchange-secmod-eddsa
+ if ! getent passwd taler-exchange-secmod-eddsa >/dev/null;
+ then
+ adduser --quiet \
+ --system \
+ --no-create-home \
+ --ingroup taler-exchange-secmod \
+ --home ${TALER_HOME} \
+ taler-exchange-secmod-eddsa
fi
- if ! getent passwd taler-exchange-wire >/dev/null; then
- adduser --quiet --system --no-create-home --home ${TALER_HOME} taler-exchange-wire
- adduser --quiet taler-exchange-wire taler-exchange-db
+ if ! getent passwd taler-exchange-wire >/dev/null;
+ then
+ adduser --quiet \
+ --system \
+ --no-create-home \
+ --home ${TALER_HOME} \
+ taler-exchange-wire
+ adduser --quiet taler-exchange-wire taler-exchange-db
fi
- if ! getent passwd taler-exchange-closer >/dev/null; then
- adduser --quiet --system --no-create-home --home ${TALER_HOME} taler-exchange-closer
- adduser --quiet taler-exchange-closer taler-exchange-db
+ if ! getent passwd taler-exchange-closer >/dev/null;
+ then
+ adduser --quiet \
+ --system \
+ --no-create-home \
+ --home ${TALER_HOME} \
+ taler-exchange-closer
+ adduser --quiet taler-exchange-closer taler-exchange-db
fi
- if ! getent passwd taler-exchange-aggregator >/dev/null; then
- adduser --quiet --system --no-create-home --home ${TALER_HOME} taler-exchange-aggregator
- adduser --quiet taler-exchange-aggregator taler-exchange-kyc
- adduser --quiet taler-exchange-aggregator taler-exchange-db
+ if ! getent passwd taler-exchange-aggregator >/dev/null;
+ then
+ adduser --quiet \
+ --system \
+ --no-create-home \
+ --home ${TALER_HOME} \
+ taler-exchange-aggregator
+ adduser --quiet taler-exchange-aggregator taler-exchange-kyc
+ adduser --quiet taler-exchange-aggregator taler-exchange-db
fi
- if ! getent passwd taler-exchange-expire >/dev/null; then
- adduser --quiet --system --no-create-home --home ${TALER_HOME} taler-exchange-expire
- adduser --quiet taler-exchange-expire taler-exchange-db
+ if ! getent passwd taler-exchange-expire >/dev/null;
+ then
+ adduser --quiet \
+ --system \
+ --no-create-home \
+ --home ${TALER_HOME} taler-exchange-expire
+ adduser --quiet taler-exchange-expire taler-exchange-db
+>>>>>>> 1f7ce0e50 (clean up debian package rules, may help with #10453)
fi
- if ! dpkg-statoverride --list /etc/taler-exchange/taler-exchange.conf >/dev/null 2>&1; then
- dpkg-statoverride --add --update \
- root root 644 \
- /etc/taler-exchange/taler-exchange.conf
+ if ! dpkg-statoverride --list /etc/taler-exchange/taler-exchange.conf >/dev/null 2>&1;
+ then
+ dpkg-statoverride --add \
+ --update \
+ root root 644 \
+ /etc/taler-exchange/taler-exchange.conf
fi
- if ! dpkg-statoverride --list /etc/taler-exchange/secrets/exchange-accountcredentials-1.secret.conf >/dev/null 2>&1; then
- dpkg-statoverride --add --update \
- taler-exchange-wire root 640 \
- /etc/taler-exchange/secrets/exchange-accountcredentials-1.secret.conf
+ if ! dpkg-statoverride --list /etc/taler-exchange/secrets/exchange-accountcredentials-1.secret.conf >/dev/null 2>&1;
+ then
+ dpkg-statoverride --add \
+ --update \
+ taler-exchange-wire root 640 \
+ /etc/taler-exchange/secrets/exchange-accountcredentials-1.secret.conf
fi
- if ! dpkg-statoverride --list /etc/taler-exchange/secrets/exchange-db.secret.conf >/dev/null 2>&1; then
- dpkg-statoverride --add --update \
- root taler-exchange-db 640 \
- /etc/taler-exchange/secrets/exchange-db.secret.conf
+ if ! dpkg-statoverride --list /etc/taler-exchange/secrets/exchange-db.secret.conf >/dev/null 2>&1;
+ then
+ dpkg-statoverride --add \
+ --update \
+ root taler-exchange-db 640 \
+ /etc/taler-exchange/secrets/exchange-db.secret.conf
fi
# Try to generate compressed versions of the SPAs
@@ -95,6 +151,4 @@ abort-upgrade | abort-remove | abort-deconfigure) ;;
;;
esac
-#DEBHELPER#
-
exit 0
diff --git a/debian/taler-exchange.postrm b/debian/taler-exchange.postrm
@@ -2,11 +2,6 @@
set -e
-if [ -f /usr/share/debconf/confmodule ];
-then
- . /usr/share/debconf/confmodule
-fi
-
case "${1}" in
purge)
rm -rf /var/lib/taler-exchange/secmod-*
@@ -36,6 +31,4 @@ remove | upgrade | failed-upgrade | abort-install | abort-upgrade | disappear)
;;
esac
-#DEBHELPER#
-
exit 0
diff --git a/debian/taler-exchange.prerm b/debian/taler-exchange.prerm
@@ -2,15 +2,10 @@
set -e
-if [ -f /usr/share/debconf/confmodule ];
+if [ -d /run/systemd/system ] && [ "$1" = remove ];
then
- . /usr/share/debconf/confmodule
+ deb-systemd-invoke stop 'taler-exchange.target' >/dev/null || true
+ deb-systemd-invoke stop 'taler-exchange.slice' >/dev/null || true
fi
-if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
- deb-systemd-invoke stop 'taler-exchange.target' >/dev/null || true
- deb-systemd-invoke stop 'taler-exchange.slice' >/dev/null || true
-fi
-
-db_stop
exit 0
