[taler-deployment] branch master updated: script improvements

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 0af08d7  script improvements
0af08d7 is described below

commit 0af08d7d0888741f4b8d8e0faec577a5ee3e05a5
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Mar 10 12:16:29 2024 +0100

    script improvements
---
 regional-currency/ChangeLog         |  5 +++++
 regional-currency/setup-exchange.sh | 18 ++++--------------
 regional-currency/setup-merchant.sh |  4 ++--
 regional-currency/upgrade.sh        | 30 ++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/regional-currency/ChangeLog b/regional-currency/ChangeLog
new file mode 100644
index 0000000..4271579
--- /dev/null
+++ b/regional-currency/ChangeLog
@@ -0,0 +1,5 @@
+Sun Mar 10 12:15:15 PM CET 2024
+        Changed the scripts to enable (!) taler-merchant.target
+        instead of just the taler-merchant-httpd service.
+
+        Added automatically setting the wire-fee for IBAN.
diff --git a/regional-currency/setup-exchange.sh 
b/regional-currency/setup-exchange.sh
index eaf2234..de0e4b9 100755
--- a/regional-currency/setup-exchange.sh
+++ b/regional-currency/setup-exchange.sh
@@ -184,13 +184,6 @@ taler-harness deployment gen-coin-config \
   sed -e "s/FEE_DEPOSIT = ${CURRENCY}:0.01/FEE_DEPOSIT = ${CURRENCY}:0/" \
     >/etc/taler/conf.d/"${CURRENCY}"-coins.conf
 
-# FIXME-DOLD: this belongs with taler-harness
-for SEC in $(taler-config -c /etc/taler/conf.d/"${CURRENCY}"-coins.conf -S 
2>/dev/null | grep COIN-); do
-  taler-config -c /etc/taler/conf.d/"${CURRENCY}"-coins.conf -s "$SEC" -o 
CIPHER -V "RSA"
-done
-
-# NOTE: already fixed in exchange.git, leaving in place
-# until 0.9.4 release of fixed exchange Debian package. -CG
 say "Initializing exchange database"
 taler-exchange-dbconfig -c /etc/taler/taler.conf &>> setup.log
 
@@ -222,6 +215,7 @@ if test ${DO_OFFLINE} == y; then
     upload &>> setup.log
 
   say "Exchange account setup..."
+  # FIXME: add 'display-hint 0 "${CURRENCY}"' for 0.10.x!
   sudo -i -u taler-exchange-offline \
     taler-exchange-offline \
     enable-account "${EXCHANGE_PAYTO}" \
@@ -232,17 +226,13 @@ if test ${DO_OFFLINE} == y; then
   if test ${DO_CONVERSION} == y; then
     say "Conversion account setup (restricted to CH-only)..."
 
+    # FIXME: add 'display-hint 10 "${CURRENCY}"' for 0.10.x!
     sudo -i -u taler-exchange-offline taler-exchange-offline \
       enable-account \
         "${CONVERSION_PAYTO}"  \
         conversion-url "${PROTO}://bank.$DOMAIN_NAME/conversion-info/" \
-        debit-restriction \
-          deny \
-        credit-restriction \
-          regex \
-            'payto://iban/.*/CH.*?receiver-name=.*' \
-            'Swiss only' \
-            '{ "de" : "nur Schweiz", "fr" : "Suisse uniquement" }' \
+        debit-restriction deny \
+      wire-fee now iban "${CURRENCY}":0 "${CURRENCY}":0 \
       upload &>> setup.log
   fi
 fi
diff --git a/regional-currency/setup-merchant.sh 
b/regional-currency/setup-merchant.sh
index a594060..a892b7a 100755
--- a/regional-currency/setup-merchant.sh
+++ b/regional-currency/setup-merchant.sh
@@ -10,5 +10,5 @@ say "Setting up merchant database"
 taler-merchant-dbconfig &>> setup.log
 
 say "Launching taler-merchant-httpd"
-systemctl enable taler-merchant-httpd &>> setup.log
-systemctl restart taler-merchant-httpd  &>> setup.log
+systemctl enable taler-merchant.target &>> setup.log
+systemctl restart taler-merchant.target  &>> setup.log
diff --git a/regional-currency/upgrade.sh b/regional-currency/upgrade.sh
new file mode 100755
index 0000000..37ed8f1
--- /dev/null
+++ b/regional-currency/upgrade.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# This file is in the public domain.
+set -eu
+
+echo "Fetching package list..."
+apt-get update
+
+echo -n "Stopping Taler services..."
+systemctl stop taler-exchange.target &>> upgrade.log
+systemctl stop taler-merchant.target &>> upgrade.log
+systemctl stop libeufin-bank &>> upgrade.log
+systemctl stop libeufin-nexus.target &>> upgrade.log
+echo " OK"
+
+echo "Upgrading packages..."
+apt-get upgrade
+
+echo "Upgrading databases..."
+libeufin-dbconfig &>> upgrade.log
+taler-exchange-dbconfig &>> upgrade.log
+taler-merchant-dbconfig &>> upgrade.log
+
+echo -n "Restarting Taler services..."
+systemctl start taler-exchange.target &>> upgrade.log
+systemctl start taler-merchant.target &>> upgrade.log
+systemctl start libeufin-bank &>> upgrade.log
+systemctl start libeufin-nexus.target &>> upgrade.log
+echo " OK"
+
+exit 0

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.