commit 9741edfe3017dd410f3039cd850dcf900cb35696
parent a6452739b0299ee8c10659980ac8084a52cf90ad
Author: Florian Dold <florian@dold.me>
Date: Tue, 9 Jun 2026 13:05:31 +0200
settings for migration and latest versions
Diffstat:
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/buildconfig/taler-exchange.tag b/buildconfig/taler-exchange.tag
@@ -1 +1 @@
-v1.6.3-dev.1
+v1.6.3-dev.2
diff --git a/buildconfig/taler-merchant.tag b/buildconfig/taler-merchant.tag
@@ -1 +1 @@
-v1.5.18-dev.4
+v1.5.18-dev.10
diff --git a/scripts/demo/setup-sandcastle.sh b/scripts/demo/setup-sandcastle.sh
@@ -378,27 +378,22 @@ fi
rm -f /usr/share/taler-exchange/config.d/kudos.conf
rm -f /usr/share/taler-merchant/config.d/kudos.conf
-
MY_HELPER_EMAIL=${OVERRIDE_MERCHANT_HELPER_EMAIL:-/data/sandcastle-merchant-email-helper}
-# By default, use standalone SPA
-MERCHANT_SPA_SETTING=
-if [[ ${STANDALONE_MERCHANT_SPA:-1} == 1 ]]; then
- MERCHANT_SPA_SETTING="BACKOFFICE_SPA_DIR = /usr/local/share/taler-merchant-backoffice/"
-fi
-
# We need to define the default currency for the UI.
cat <<EOF >/etc/taler-merchant/conf.d/sandcastle-merchant.conf
[merchant]
+# Default currency
CURRENCY = $CURRENCY
-
ENABLE_SELF_PROVISIONING = YES
-
MANDATORY_TAN_CHANNELS = email
-
HELPER_EMAIL = $MY_HELPER_EMAIL
-$MERCHANT_SPA_SETTING
+BASE_URL = $PROTO://$MERCHANT_DOMAIN$PORT_SUFFIX/
+
+# Will be the default in future merchant versions
+# => Can be removed after 1.6 release
+BACKOFFICE_SPA_DIR = /usr/share/taler-merchant-webui/
EOF
@@ -480,11 +475,16 @@ function wait_pg_ready() {
done
}
+PG_VERSION="17"
+
# Since the sandcastle is a test system, we turn fsync off for performance
# reasons (especially with the drupal setup).
# CAUTION: You do not want to set this in production,
# especially not for the taler-exchange.
-pg_conftool 17 main set fsync off
+pg_conftool $PG_VERSION main set fsync off
+# Higher limits needed for migration
+pg_conftool $PG_VERSION main set max_locks_per_transaction 512
+pg_conftool $PG_VERSION main set max_pred_locks_per_transaction 512
backup_file=/exported/postgres-backup.sql
if [[ $import_instr = singledump ]]; then
