commit b2d16ff4bc85c8b83b0445364ebb3e66708ad8dc
parent 8efe1dcfb90b53cae4d894a934473c0b6d7ed770
Author: Florian Dold <florian@dold.me>
Date: Tue, 8 Mar 2022 15:36:43 +0100
secmod cs
Diffstat:
6 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/bin/taler-deployment-config-generate b/bin/taler-deployment-config-generate
@@ -152,6 +152,8 @@ def config(obj):
obj.cfg_put("taler-exchange-secmod-eddsa", "unixpath", "$HOME/sockets/taler-exchange-secmod-eddsa.sock")
obj.cfg_put("taler-exchange-secmod-rsa", "unixpath", "$HOME/sockets/taler-exchange-secmod-rsa.sock")
obj.cfg_put("taler-exchange-secmod-rsa", "sm_priv_key", "${TALER_DATA_HOME}/taler-exchange-secmod-rsa/secmod-private-key")
+ obj.cfg_put("taler-exchange-secmod-cs", "unixpath", "$HOME/sockets/taler-exchange-secmod-cs.sock")
+ obj.cfg_put("taler-exchange-secmod-cs", "sm_priv_key", "${TALER_DATA_HOME}/taler-exchange-secmod-cs/secmod-private-key")
obj.cfg_put("exchange", "base_url", urls["exchange"])
diff --git a/bin/taler-deployment-config-generate-sepa b/bin/taler-deployment-config-generate-sepa
@@ -157,6 +157,8 @@ def config(obj):
obj.cfg_put("taler-exchange-secmod-eddsa", "unixpath", "$HOME/sockets/taler-exchange-secmod-eddsa.sock")
obj.cfg_put("taler-exchange-secmod-rsa", "unixpath", "$HOME/sockets/taler-exchange-secmod-rsa.sock")
obj.cfg_put("taler-exchange-secmod-rsa", "sm_priv_key", "${TALER_DATA_HOME}/taler-exchange-secmod-rsa/secmod-private-key")
+ obj.cfg_put("taler-exchange-secmod-cs", "unixpath", "$HOME/sockets/taler-exchange-secmod-cs.sock")
+ obj.cfg_put("taler-exchange-secmod-cs", "sm_priv_key", "${TALER_DATA_HOME}/taler-exchange-secmod-cs/secmod-private-key")
obj.cfg_put("exchange", "base_url", urls["exchange"])
diff --git a/bin/taler-deployment-prepare b/bin/taler-deployment-prepare
@@ -131,6 +131,7 @@ taler-deployment-arm -s
# Quickly start+shutdown exchange httpd and crypto SM helpers
taler-deployment-arm -i taler-exchange
taler-deployment-arm -i taler-exchange-secmod-rsa
+taler-deployment-arm -i taler-exchange-secmod-cs
taler-deployment-arm -i taler-exchange-secmod-eddsa
sleep 2 # FIXME: poll keys?
@@ -144,7 +145,12 @@ if ! taler-deployment-arm -I | grep "^taler-exchange-secmod-rsa" | grep "status=
fi
if ! taler-deployment-arm -I | grep "^taler-exchange-secmod-eddsa" | grep "status=started" > /dev/null; then
- echo "Exchange (EDDSA module) didn't start, cannot set up keys."
+ echo "Exchange (EdDSA module) didn't start, cannot set up keys."
+ exit 1
+fi
+
+if ! taler-deployment-arm -I | grep "^taler-exchange-secmod-cs" | grep "status=started" > /dev/null; then
+ echo "Exchange (CS module) didn't start, cannot set up keys."
exit 1
fi
@@ -162,6 +168,7 @@ done
taler-deployment-arm -k taler-exchange
taler-deployment-arm -k taler-exchange-secmod-rsa
+taler-deployment-arm -k taler-exchange-secmod-cs
taler-deployment-arm -k taler-exchange-secmod-eddsa
# Give time to store to disk.
@@ -225,32 +232,38 @@ taler-deployment-arm -i taler-demobank
taler-deployment-arm -i taler-exchange
taler-deployment-arm -i taler-exchange-secmod-rsa
+taler-deployment-arm -i taler-exchange-secmod-cs
taler-deployment-arm -i taler-exchange-secmod-eddsa
sleep 5
if ! taler-deployment-arm -I | grep "^taler-merchant" | grep "status=started" > /dev/null; then
- echo "Merchant didn't start, cannot configure instances / create tip reserve."
- exit 1
+ echo "Merchant didn't start, cannot configure instances / create tip reserve."
+ exit 1
fi
if ! taler-deployment-arm -I | grep "^taler-demobank" | grep "status=started" > /dev/null; then
- echo "Bank didn't start, cannot create tip reserve."
- exit 1
+ echo "Bank didn't start, cannot create tip reserve."
+ exit 1
fi
if ! taler-deployment-arm -I | grep "^taler-exchange" | grep "status=started" > /dev/null; then
- echo "Exchange didn't start, cannot create tip reserve."
- exit 1
+ echo "Exchange didn't start, cannot create tip reserve."
+ exit 1
fi
if ! taler-deployment-arm -I | grep "^taler-exchange-secmod-rsa" | grep "status=started" > /dev/null; then
- echo "Exchange (RSA module) didn't start, cannot create tip reserve."
- exit 1
+ echo "Exchange (RSA module) didn't start, cannot create tip reserve."
+ exit 1
fi
if ! taler-deployment-arm -I | grep "^taler-exchange-secmod-eddsa" | grep "status=started" > /dev/null; then
- echo "Exchange (EDDSA module) didn't start, cannot create tip reserve."
- exit 1
+ echo "Exchange (EDDSA module) didn't start, cannot create tip reserve."
+ exit 1
+fi
+
+if ! taler-deployment-arm -I | grep "^taler-exchange-secmod-cs" | grep "status=started" > /dev/null; then
+ echo "Exchange (CS module) didn't start, cannot create tip reserve."
+ exit 1
fi
echo "Configuring instances"
@@ -263,6 +276,7 @@ taler-deployment-arm -k taler-merchant
taler-deployment-arm -k taler-demobank
taler-deployment-arm -k taler-exchange
taler-deployment-arm -k taler-exchange-secmod-rsa
+taler-deployment-arm -k taler-exchange-secmod-cs
taler-deployment-arm -k taler-exchange-secmod-eddsa
taler-deployment-arm -e
@@ -281,7 +295,7 @@ fi
##
if test $WITH_DB_RESET = yes; then
-sync-dbinit --reset
+ sync-dbinit --reset
else
-sync-dbinit
+ sync-dbinit
fi
diff --git a/bin/taler-deployment-prepare-with-eufin b/bin/taler-deployment-prepare-with-eufin
@@ -137,6 +137,7 @@ taler-deployment-arm -s
# Quickly start+shutdown exchange httpd and crypto SM helpers
taler-deployment-arm -i taler-exchange
taler-deployment-arm -i taler-exchange-secmod-rsa
+taler-deployment-arm -i taler-exchange-secmod-cs
taler-deployment-arm -i taler-exchange-secmod-eddsa
sleep 2 # FIXME: poll keys?
@@ -144,11 +145,17 @@ if ! taler-deployment-arm -I | grep "^taler-exchange" | grep "status=started" >
echo "Exchange didn't start, cannot set up keys"
exit 1
fi
+
if ! taler-deployment-arm -I | grep "^taler-exchange-secmod-rsa" | grep "status=started" > /dev/null; then
echo "Exchange (RSA module) didn't start, cannot set up keys."
exit 1
fi
+if ! taler-deployment-arm -I | grep "^taler-exchange-secmod-cs" | grep "status=started" > /dev/null; then
+ echo "Exchange (CS module) didn't start, cannot set up keys."
+ exit 1
+fi
+
if ! taler-deployment-arm -I | grep "^taler-exchange-secmod-eddsa" | grep "status=started" > /dev/null; then
echo "Exchange (EDDSA module) didn't start, cannot set up keys."
exit 1
@@ -168,6 +175,7 @@ done
taler-deployment-arm -k taler-exchange
taler-deployment-arm -k taler-exchange-secmod-rsa
+taler-deployment-arm -k taler-exchange-secmod-cs
taler-deployment-arm -k taler-exchange-secmod-eddsa
echo " OK"
# Give time to store to disk.
@@ -388,6 +396,7 @@ taler-deployment-arm -s
taler-deployment-arm -i taler-exchange
taler-deployment-arm -i taler-exchange-secmod-rsa
+taler-deployment-arm -i taler-exchange-secmod-cs
taler-deployment-arm -i taler-exchange-secmod-eddsa
sleep 5
@@ -401,6 +410,11 @@ if ! taler-deployment-arm -I | grep "^taler-exchange-secmod-rsa" | grep "status=
exit 1
fi
+if ! taler-deployment-arm -I | grep "^taler-exchange-secmod-cs" | grep "status=started" > /dev/null; then
+ echo "Exchange (CS module) didn't start, cannot create tip reserve."
+ exit 1
+fi
+
if ! taler-deployment-arm -I | grep "^taler-exchange-secmod-eddsa" | grep "status=started" > /dev/null; then
echo "Exchange (EDDSA module) didn't start, cannot create tip reserve."
exit 1
@@ -414,5 +428,6 @@ echo "Stopping all the services"
# all the running ones.
taler-deployment-arm -k taler-exchange
taler-deployment-arm -k taler-exchange-secmod-rsa
+taler-deployment-arm -k taler-exchange-secmod-cs
taler-deployment-arm -k taler-exchange-secmod-eddsa
taler-deployment-arm -e
diff --git a/bin/taler-deployment-start b/bin/taler-deployment-start
@@ -21,6 +21,7 @@ taler-deployment-arm -s
taler-deployment-arm -i taler-exchange
taler-deployment-arm -i taler-exchange-secmod-eddsa
taler-deployment-arm -i taler-exchange-secmod-rsa
+taler-deployment-arm -i taler-exchange-secmod-cs
taler-deployment-arm -i taler-auditor
taler-deployment-arm -i taler-merchant
taler-deployment-arm -i taler-demobank
diff --git a/bin/taler-deployment-start-with-eufin b/bin/taler-deployment-start-with-eufin
@@ -21,6 +21,7 @@ taler-deployment-arm -s
taler-deployment-arm -i taler-exchange
taler-deployment-arm -i taler-exchange-secmod-eddsa
taler-deployment-arm -i taler-exchange-secmod-rsa
+taler-deployment-arm -i taler-exchange-secmod-cs
taler-deployment-arm -i taler-auditor
taler-deployment-arm -i taler-merchant
taler-deployment-arm -i libeufin-sandbox
