sandcastle-ng

commit 74d5fc489fec98da96d3a8888ff3d26b699f358c
parent 697d598821b234081a9ad7d32da7d6c4d9f84c5e
Author: Florian Dold <florian@dold.me>
Date:   Wed, 10 Jan 2024 13:49:42 +0100

sandcastle-ng: update tags

Diffstat:
M
buildconfig/exchange.tag
 | 
2
+-
M
buildconfig/gnunet.tag
 | 
2
+-
M
buildconfig/libeufin.tag
 | 
2
+-
M
buildconfig/merchant.tag
 | 
2
+-
M
buildconfig/wallet.tag
 | 
2
+-
M
scripts/demo/setup-sandcastle.sh
 | 
14
++------------

6 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/buildconfig/exchange.tag b/buildconfig/exchange.tag
@@ -1 +1 @@
-v0.9.4-dev.4
+v0.9.4-dev.8
diff --git a/buildconfig/gnunet.tag b/buildconfig/gnunet.tag
@@ -1 +1 @@
-v0.21.0-talerdev.2
+v0.21.0-talerdev.4
diff --git a/buildconfig/libeufin.tag b/buildconfig/libeufin.tag
@@ -1 +1 @@
-v0.9.3-dev.33
+v0.9.3-dev.34
diff --git a/buildconfig/merchant.tag b/buildconfig/merchant.tag
@@ -1 +1 @@
-v0.9.4-dev.4
+v0.9.4-dev.5
diff --git a/buildconfig/wallet.tag b/buildconfig/wallet.tag
@@ -1 +1 @@
-v0.9.4-dev.1
+v0.9.4-dev.4
diff --git a/scripts/demo/setup-sandcastle.sh b/scripts/demo/setup-sandcastle.sh
@@ -364,18 +364,8 @@ echo 'GRANT USAGE ON SCHEMA _v TO "taler-exchange-aggregator";' | sudo -i -u pos
 echo 'GRANT SELECT ON ALL TABLES IN SCHEMA _v TO "taler-exchange-aggregator";' | sudo -i -u postgres psql -f - ${EXCHANGE_DB}
 
 
-# # The ToS generator is currently borked, we don't generated ToS until that's fixed.
-TOS_PATH=/usr/share/taler/terms
-if [[ ! -e "$TOS_PATH/stamp-generated" ]]; then
-  # ToS generator is picky about the path that it is being run from
-  cd $TOS_PATH
-  taler-terms-generator -i exchange-tos-v0 -a "Taler Systems SA" -C "Taler Systems SA" -p a4 -o $TOS_PATH -l en
-  taler-terms-generator -i exchange-pp-v0 -a "Taler Systems SA" -C "Taler Systems SA" -p a4 -o $TOS_PATH -l en
-  taler-terms-generator -i exchange-tos-v0 -a "Taler Systems SA" -C "Taler Systems SA" -p a4 -o $TOS_PATH
-  taler-terms-generator -i exchange-pp-v0 -a "Taler Systems SA" -C "Taler Systems SA" -p a4 -o $TOS_PATH
-  touch "$TOS_PATH/stamp-generated"
-  cd -
-fi
+taler-terms-generator -i /usr/share/taler/terms/exchange-tos-v0
+taler-terms-generator -i /usr/share/taler/terms/exchange-pp-v0
 
 systemctl enable --now taler-exchange.target