summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoss Marco <bossm8@bfh.ch>2022-05-21 16:31:14 +0200
committerBoss Marco <bossm8@bfh.ch>2022-05-21 16:31:14 +0200
commit3e5e9c65b11e35e42f062867d9892ebc8d879e52 (patch)
treedeca9a71fd6f643e610e7a587bd16abf5f9eb542
parent67c68fb9ca44644b2d9fc7eb1b15f0157e19521c (diff)
downloadgrid5k-3e5e9c65b11e35e42f062867d9892ebc8d879e52.tar.gz
grid5k-3e5e9c65b11e35e42f062867d9892ebc8d879e52.tar.bz2
grid5k-3e5e9c65b11e35e42f062867d9892ebc8d879e52.zip
working setupfb/multiple-banks
-rwxr-xr-xexperiment/scripts/exchange-wirewatch.sh9
-rw-r--r--experiment/scripts/setup.sh2
2 files changed, 7 insertions, 4 deletions
diff --git a/experiment/scripts/exchange-wirewatch.sh b/experiment/scripts/exchange-wirewatch.sh
index 9d85078..5224f36 100755
--- a/experiment/scripts/exchange-wirewatch.sh
+++ b/experiment/scripts/exchange-wirewatch.sh
@@ -20,15 +20,18 @@ source ~/scripts/helpers.sh
# $1: N - number of new aggregators to start
function start_wirewatches() {
cp -rp /etc/taler /etc/taler-1
+
sed -i -e "/exchange-account-1/,+7 d" \
- -e "s/exchange-account-2/exchange-account-1/g" \
+ -e "s/exchange-accountcredentials-1/exchange-accountcredentials-2/g" \
/etc/taler/conf.d/exchange-business.conf
- sed -i -e "/exchange-account-2/,+7 d" /etc/taler-1/conf.d/exchange-business.conf
sed -i -e "/exchange-accountcredentials-1/,+6 d" \
- -e "/exchange-accountcredentials-2/exchange-accountcredentials-1/g" \
/etc/taler/secrets/exchange-accountcredentials.secret.conf
+
+ sed -i -e "/exchange-account-2/,+7 d" \
+ /etc/taler-1/conf.d/exchange-business.conf
sed -i -e "/exchange-accountcredentials-2/,+6 d" \
/etc/taler-1/secrets/exchange-accountcredentials.secret.conf
+
# count the running wirewatches so that numbers can be increased
systemctl restart taler-exchange-wirewatchbank1.service
systemctl restart taler-exchange-wirewatchbank2.service
diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index 74028af..ee42dc8 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -129,7 +129,7 @@ function setup_environment() {
# Setup shared configurations such as the ones from configs/*
function setup_config() {
# Temporarily checkout to the feature branch
- cd "${G5K_HOME}" && git fetch && git checkout "${G5K_COMMIT_SHA}" && git pull && cd
+ cd "${G5K_HOME}" && git pull && git checkout "${G5K_COMMIT_SHA}" && git pull && cd
# Remove default nginx config
rm /etc/nginx/sites-enabled/default > /dev/null 2>&1 || true