From 7bdf02db66c618ead83079efa739da968d65b7b5 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Wed, 10 Jan 2024 21:13:25 +0100
Subject: debian: add missing parts for taler-exchange-expire service

---
 contrib/gana                   | 2 +-
 contrib/wallet-core            | 2 +-
 debian/rules                   | 1 +
 debian/taler-exchange.postinst | 5 +++++
 debian/taler-exchange.postrm   | 2 ++
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index 0ff4edfe7..9eddc2cf7 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 0ff4edfe76be77a59d4ebff5031feb50f3ba07d8
+Subproject commit 9eddc2cf7b65bb43d285c75ef22fd9bc9cc7020e
diff --git a/contrib/wallet-core b/contrib/wallet-core
index 496bfdc3a..a675c9408 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit 496bfdc3aecbea61922bb2e0c281f5d35f934a3b
+Subproject commit a675c94085cfa90052c9ebacd2cebccfab2c4f18
diff --git a/debian/rules b/debian/rules
index aef4bf5f8..b957c81ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,7 @@ override_dh_installsystemd:
 	# and dh_installsystemd by default only looks for "<package>.service".
 	dh_installsystemd -ptaler-exchange --name=taler-exchange-httpd --no-start --no-enable
 	dh_installsystemd -ptaler-exchange --name=taler-exchange-aggregator --no-start --no-enable
+	dh_installsystemd -ptaler-exchange --name=taler-exchange-expire --no-start --no-enable
 	dh_installsystemd -ptaler-exchange --name=taler-exchange-transfer --no-start --no-enable
 	dh_installsystemd -ptaler-exchange --name=taler-exchange-wirewatch --no-start --no-enable
 	dh_installsystemd -ptaler-exchange --name=taler-exchange-secmod-cs --no-start --no-enable
diff --git a/debian/taler-exchange.postinst b/debian/taler-exchange.postinst
index 6278dac1f..7509a7749 100644
--- a/debian/taler-exchange.postinst
+++ b/debian/taler-exchange.postinst
@@ -13,6 +13,7 @@ _CSECUSERNAME=taler-exchange-secmod-cs
 _RSECUSERNAME=taler-exchange-secmod-rsa
 _ESECUSERNAME=taler-exchange-secmod-eddsa
 _AGGRUSERNAME=taler-exchange-aggregator
+_EXPIUSERNAME=taler-exchange-expire
 _WIREUSERNAME=taler-exchange-wire
 
 case "${1}" in
@@ -53,6 +54,10 @@ configure)
     adduser --quiet --system --no-create-home --home ${TALER_HOME} ${_AGGRUSERNAME}
     adduser --quiet ${_AGGRUSERNAME} ${_DBGROUPNAME}
   fi
+  if ! getent passwd ${_EXPIUSERNAME} >/dev/null; then
+    adduser --quiet --system --no-create-home --home ${TALER_HOME} ${_EXPIUSERNAME}
+    adduser --quiet ${_EXPIUSERNAME} ${_DBGROUPNAME}
+  fi
 
   if ! dpkg-statoverride --list /etc/taler/secrets/exchange-accountcredentials-1.secret.conf >/dev/null 2>&1; then
     dpkg-statoverride --add --update \
diff --git a/debian/taler-exchange.postrm b/debian/taler-exchange.postrm
index 9edf548a5..fcde84b58 100644
--- a/debian/taler-exchange.postrm
+++ b/debian/taler-exchange.postrm
@@ -10,6 +10,7 @@ _CSECUSERNAME=taler-exchange-secmod-cs
 _RSECUSERNAME=taler-exchange-secmod-rsa
 _ESECUSERNAME=taler-exchange-secmod-eddsa
 _AGGRUSERNAME=taler-exchange-aggregator
+_EXPIUSERNAME=taler-exchange-expire
 _WIREUSERNAME=taler-exchange-wire
 
 
@@ -28,6 +29,7 @@ purge)
     deluser --quiet --system ${_RSECUSERNAME} || true
     deluser --quiet --system ${_ESECUSERNAME} || true
     deluser --quiet --system ${_AGGRUSERNAME} || true
+    deluser --quiet --system ${_EXPIUSERNAME} || true
     deluser --quiet --system ${_WIREUSERNAME} || true
     deluser --quiet --system ${_CLOSERUSERNAME} || true
     deluser --quiet --system ${_EUSERNAME} || true
-- 
cgit v1.2.3