merchant

commit 0f448ae1bd1be60646acf00b1b97c47b7786707c
parent 1af63982767a382a490c38f07ac4a8fe3019db47
Author: bohdan-potuzhnyi <bohdan.potuzhnyi@gmail.com>
Date:   Thu,  3 Apr 2025 12:48:18 +0200

Merge branch 'master' of ssh://git.taler.net/merchant

Diffstat:
M
debian/taler-merchant.install
 | 
1
-
M
debian/taler-merchant.postinst
 | 
21
+++++++++++++++++++++
M
debian/taler-merchant.prerm
 | 
2
+-
M
doc/Makefile.am
 | 
1
+
M
src/merchant-tools/Makefile.am
 | 
6
+++++-

5 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/debian/taler-merchant.install b/debian/taler-merchant.install
@@ -1,6 +1,5 @@
 usr/bin/taler-merchant-*
 
-# FIXME: Why does this not go into libtalermerchant?
 usr/lib/*/libtalermerchantdb.so.*
 
 usr/lib/*/taler-merchant/*.so
diff --git a/debian/taler-merchant.postinst b/debian/taler-merchant.postinst
@@ -7,14 +7,35 @@ if [ -d /run/systemd/system ]; then
 fi
 if [ "$1" = "remove" ]; then
         if [ -x "/usr/bin/deb-systemd-helper" ]; then
+                deb-systemd-helper mask 'taler-merchant-depositcheck.service' >/dev/null || true
+                deb-systemd-helper mask 'taler-merchant-exchangekeyupdate.service' >/dev/null || true
                 deb-systemd-helper mask 'taler-merchant-httpd.service' >/dev/null || true
+                deb-systemd-helper mask 'taler-merchant-kyccheck.service' >/dev/null || true
+                deb-systemd-helper mask 'taler-merchant-reconciliation.service' >/dev/null || true
+                deb-systemd-helper mask 'taler-merchant-webhook.service' >/dev/null || true
+                deb-systemd-helper mask 'taler-merchant-wirewatch.service' >/dev/null || true
+                deb-systemd-helper mask 'taler-merchant.target' >/dev/null || true
         fi
 fi
 
 if [ "$1" = "purge" ]; then
         if [ -x "/usr/bin/deb-systemd-helper" ]; then
+                deb-systemd-helper purge 'taler-merchant-depositcheck.service' >/dev/null || true
+                deb-systemd-helper unmask 'taler-merchant-depositcheck.service' >/dev/null || true
+                deb-systemd-helper purge 'taler-merchant-exchangekeyupdate.service' >/dev/null || true
+                deb-systemd-helper unmask 'taler-merchant-exchangekeyupdate.service' >/dev/null || true
                 deb-systemd-helper purge 'taler-merchant-httpd.service' >/dev/null || true
                 deb-systemd-helper unmask 'taler-merchant-httpd.service' >/dev/null || true
+                deb-systemd-helper purge 'taler-merchant-kyccheck.service' >/dev/null || true
+                deb-systemd-helper unmask 'taler-merchant-kyccheck.service' >/dev/null || true
+                deb-systemd-helper purge 'taler-merchant-reconciliation.service' >/dev/null || true
+                deb-systemd-helper unmask 'taler-merchant-reconciliation.service' >/dev/null || true
+                deb-systemd-helper purge 'taler-merchant-webhook.service' >/dev/null || true
+                deb-systemd-helper unmask 'taler-merchant-webhook.service' >/dev/null || true
+                deb-systemd-helper purge 'taler-merchant-wirewatch.service' >/dev/null || true
+                deb-systemd-helper unmask 'taler-merchant-wirewatch.service' >/dev/null || true
+                deb-systemd-helper purge 'taler-merchant.target' >/dev/null || true
+                deb-systemd-helper unmask 'taler-merchant.target' >/dev/null || true
         fi
 fi
 
diff --git a/debian/taler-merchant.prerm b/debian/taler-merchant.prerm
@@ -3,7 +3,7 @@
 set -e
 
 if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
-        deb-systemd-invoke stop 'taler-merchant-httpd.service' >/dev/null || true
+        deb-systemd-invoke stop 'taler-merchant*' >/dev/null || true
 fi
 
 exit 0
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -11,6 +11,7 @@ man_MANS = \
   prebuilt/man/taler-merchant-kyccheck.1          \
   prebuilt/man/taler-merchant-passwd.1            \
   prebuilt/man/taler-merchant-reconciliation.1    \
+  prebuilt/man/taler-merchant-rproxy-setup.1      \
   prebuilt/man/taler-merchant-webhook.1           \
   prebuilt/man/taler-merchant-wirewatch.1
 
diff --git a/src/merchant-tools/Makefile.am b/src/merchant-tools/Makefile.am
@@ -11,12 +11,16 @@ bin_PROGRAMS = \
   taler-merchant-passwd \
   taler-merchant-benchmark
 
+bin_SCRIPTS = \
+  taler-merchant-rproxy-setup
+
 EXTRA_DIST = \
   benchmark-common.conf \
   benchmark-cs.conf \
   benchmark-rsa.conf \
   coins-cs.conf \
-  coins-rsa.conf
+  coins-rsa.conf \
+  $(bin_SCRIPTS)
 
 taler_merchant_benchmark_SOURCES = \
   taler-merchant-benchmark.c