[taler-grid5k] 50/189: add offloaded processes

[gnunet]

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

marco-boss pushed a commit to branch master
in repository grid5k.

commit 7a80cceb37bd875a27254927b5ca3e2661c3a5a1
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed Mar 9 15:47:33 2022 +0100

    add offloaded processes
---
 configs/etc/monitor/node-exporters.yaml.tpl        | 16 ++++++
 configs/etc/taler/conf.d/exchange-business.conf    |  2 +
 ....service => taler-exchange-aggregator@.service} |  3 +-
 ...oser.service => taler-exchange-closer@.service} |  3 +-
 .../systemd/system/taler-exchange-httpd.service    | 25 ---------
 .../lib/systemd/system/taler-exchange-httpd.socket | 14 -----
 .../systemd/system/taler-exchange-httpd@.service   |  1 -
 ...er.service => taler-exchange-transfer@.service} |  3 +-
 .../system/taler-exchange-wirewatch.service        | 16 ------
 .../usr/lib/systemd/system/taler-exchange.target   | 12 -----
 experiment/env                                     | 18 +++++--
 experiment/scripts/exchange-aggregator.sh          | 17 ++++--
 experiment/scripts/exchange-closer.sh              | 41 +++++++++++++++
 experiment/scripts/exchange-transfer.sh            | 41 +++++++++++++++
 experiment/scripts/exchange-wirewatch.sh           | 41 +++++++++++++++
 experiment/scripts/exchange.sh                     | 60 +++++++++++-----------
 experiment/scripts/helpers.sh                      | 21 ++++++--
 experiment/scripts/run.sh                          | 28 ++++++++++
 experiment/taler.rspec                             | 44 +++++++++++++---
 19 files changed, 283 insertions(+), 123 deletions(-)

diff --git a/configs/etc/monitor/node-exporters.yaml.tpl 
b/configs/etc/monitor/node-exporters.yaml.tpl
index a159c39..a4905eb 100644
--- a/configs/etc/monitor/node-exporters.yaml.tpl
+++ b/configs/etc/monitor/node-exporters.yaml.tpl
@@ -16,6 +16,22 @@
         component: 'exchange'
       targets:
       - '${EXCHANGE_DOMAIN}:9100'
+    - labels:
+        component: 'exchange-aggregator'
+      targets:
+      - '${EXCH_AGGREGATOR_DOMAIN}:9100'
+    - labels:
+        component: 'exchange-closer'
+      targets:
+      - '${EXCH_CLOSER_DOMAIN}:9100'
+    - labels:
+        component: 'exchange-transfer'
+      targets:
+      - '${EXCH_TRANSFER_DOMAIN}:9100'
+    - labels:
+        component: 'exchange-wirewatch'
+      targets:
+      - '${EXCH_WIREWATCH_DOMAIN}:9100'
     - labels:
         component: 'proxy'
       targets:
diff --git a/configs/etc/taler/conf.d/exchange-business.conf 
b/configs/etc/taler/conf.d/exchange-business.conf
index c5e6e17..fcb1e3d 100644
--- a/configs/etc/taler/conf.d/exchange-business.conf
+++ b/configs/etc/taler/conf.d/exchange-business.conf
@@ -22,6 +22,8 @@ MAX_REQUESTS = <MAX_REQUESTS_HERE>
 # TERMS_ETAG =
 # PRIVACY_ETAG =
 
+AGGREGATOR_SHARD_SIZE = <AGGREGATOR_SHARD_SIZE_HERE>
+
 # Bank accounts used by the exchange should be specified here:
 [exchange-account-1]
 
diff --git a/configs/usr/lib/systemd/system/taler-exchange-aggregator.service 
b/configs/usr/lib/systemd/system/taler-exchange-aggregator@.service
similarity index 92%
rename from configs/usr/lib/systemd/system/taler-exchange-aggregator.service
rename to configs/usr/lib/systemd/system/taler-exchange-aggregator@.service
index 9aba5a4..1f35b0f 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-aggregator.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-aggregator@.service
@@ -1,6 +1,5 @@
 [Unit]
-Description=GNU Taler payment system exchange aggregator service
-PartOf=taler-exchange.target
+Description=GNU Taler payment system exchange aggregator service %I
 
 [Service]
 User=taler-exchange-aggregator
diff --git a/configs/usr/lib/systemd/system/taler-exchange-closer.service 
b/configs/usr/lib/systemd/system/taler-exchange-closer@.service
similarity index 76%
rename from configs/usr/lib/systemd/system/taler-exchange-closer.service
rename to configs/usr/lib/systemd/system/taler-exchange-closer@.service
index 0728ce2..97a48a5 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-closer.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-closer@.service
@@ -1,6 +1,5 @@
 [Unit]
-Description=GNU Taler payment system exchange closer service
-PartOf=taler-exchange.target
+Description=GNU Taler payment system exchange closer service %I
 
 [Service]
 User=taler-exchange-closer
diff --git a/configs/usr/lib/systemd/system/taler-exchange-httpd.service 
b/configs/usr/lib/systemd/system/taler-exchange-httpd.service
deleted file mode 100644
index 4e82972..0000000
--- a/configs/usr/lib/systemd/system/taler-exchange-httpd.service
+++ /dev/null
@@ -1,25 +0,0 @@
-[Unit]
-Description=GNU Taler payment system exchange REST API
-AssertPathExists=/run/taler/exchange-httpd
-Requires=taler-exchange-httpd.socket taler-exchange-secmod-rsa.service 
taler-exchange-secmod-eddsa.service taler-exchange-secmod-cs.service
-After=postgres.service network.target taler-exchange-secmod-rsa.service 
taler-exchange-secmod-cs.service
-PartOf=taler-exchange.target
-
-[Service]
-User=taler-exchange-httpd
-Type=simple
-# Depending on the configuration, the service suicides and then
-# needs to be restarted.
-Restart=always
-# Do not dally on restarts.
-RestartSec=1ms
-EnvironmentFile=/etc/environment
-ExecStart=<CMD_PREFIX_HERE>/usr/bin/taler-exchange-httpd -c 
/etc/taler/taler.conf $TALER_ARGS $EXCHANGE_ARGS
-StandardOutput=journal
-StandardError=journal
-PrivateTmp=no
-PrivateDevices=yes
-ProtectSystem=full
-
-[Install]
-WantedBy=multi-user.target
diff --git a/configs/usr/lib/systemd/system/taler-exchange-httpd.socket 
b/configs/usr/lib/systemd/system/taler-exchange-httpd.socket
deleted file mode 100644
index 59aa5be..0000000
--- a/configs/usr/lib/systemd/system/taler-exchange-httpd.socket
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Taler Exchange Socket
-PartOf=taler-exchange-httpd.service
-
-[Socket]
-ListenStream=80
-Accept=no
-Service=taler-exchange-httpd.service
-SocketUser=taler-exchange-httpd
-SocketGroup=www-data
-SocketMode=0660
-
-[Install]
-WantedBy=sockets.target
diff --git a/configs/usr/lib/systemd/system/taler-exchange-httpd@.service 
b/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
index 03477ad..85b5921 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
@@ -3,7 +3,6 @@ Description=GNU Taler payment system exchange REST API at %I
 AssertPathExists=/run/taler/exchange-httpd
 Requires=taler-exchange-httpd@%i.socket taler-exchange-secmod-rsa.service 
taler-exchange-secmod-eddsa.service
 After=postgres.service network.target taler-exchange-secmod-rsa.service 
taler-exchange-secmod-eddsa.service
-PartOf=taler-exchange.target
 
 [Service]
 User=taler-exchange-httpd
diff --git a/configs/usr/lib/systemd/system/taler-exchange-transfer.service 
b/configs/usr/lib/systemd/system/taler-exchange-transfer@.service
similarity index 81%
rename from configs/usr/lib/systemd/system/taler-exchange-transfer.service
rename to configs/usr/lib/systemd/system/taler-exchange-transfer@.service
index 325a37a..6377ab6 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-transfer.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-transfer@.service
@@ -1,7 +1,6 @@
 [Unit]
-Description=Taler Exchange Transfer Service
+Description=Taler Exchange Transfer Service %I
 After=network.target
-PartOf=taler-exchange.target
 
 [Service]
 User=taler-exchange-wire
diff --git a/configs/usr/lib/systemd/system/taler-exchange-wirewatch.service 
b/configs/usr/lib/systemd/system/taler-exchange-wirewatch.service
deleted file mode 100644
index 7efe7de..0000000
--- a/configs/usr/lib/systemd/system/taler-exchange-wirewatch.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=GNU Taler payment system exchange wirewatch service
-After=network.target
-PartOf=taler-exchange.target
-
-[Service]
-User=taler-exchange-wire
-Type=simple
-Restart=on-failure
-EnvironmentFile=/etc/environment
-ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf 
$TALER_ARGS $WIREWATCH_ARGS
-StandardOutput=journal
-StandardError=journal
-PrivateTmp=yes
-PrivateDevices=yes
-ProtectSystem=full
diff --git a/configs/usr/lib/systemd/system/taler-exchange.target 
b/configs/usr/lib/systemd/system/taler-exchange.target
deleted file mode 100644
index eea37c8..0000000
--- a/configs/usr/lib/systemd/system/taler-exchange.target
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=GNU Taler exchange
-After=postgres.service network.target
-
-Wants=taler-exchange-httpd.service
-Wants=taler-exchange-wirewatch.service
-Wants=taler-exchange-aggregator.service
-Wants=taler-exchange-closer.service
-Wants=taler-exchange-transfer.service
-
-[Install]
-WantedBy=multi-user.target
diff --git a/experiment/env b/experiment/env
index 2f8fd33..3987c56 100644
--- a/experiment/env
+++ b/experiment/env
@@ -8,7 +8,10 @@
 # (used to determine which script to execute in run.sh)
 # Wallets are not needed explicitely since they can (and will be)
 # exported as a wildcard (*).
-NODES="Bank DB DNS Exchange Merchant Monitor Proxy Shard"
+NODES="Bank DB DNS Exchange Aggregator Closer Transfer Wirewatch Merchant 
Monitor Proxy Shard"
+# Use the line below if all processes of the exchange should be running
+# on a single node
+#NODES="Bank DB DNS Exchange Merchant Monitor Proxy Shard"
 
 # DNS Zone to setup inside the grid for the experiment
 DNS_ZONE=perf.taler
@@ -32,8 +35,13 @@ EXCHANGE_DOMAIN=exchange.${DNS_ZONE}
 MERCHANT_DOMAIN=merchant.${DNS_ZONE}
  MONITOR_DOMAIN=monitor.${DNS_ZONE}
    PROXY_DOMAIN=proxy.${DNS_ZONE}
-  WALLET_DOMAIN=wallet.*.${DNS_ZONE}
    SHARD_DOMAIN=shard.*.${DNS_ZONE}
+# Secondary domains only important for the node dashboards
+         WALLET_DOMAIN=wallet.*.${DNS_ZONE}
+EXCH_AGGREGATOR_DOMAIN=exch-aggregator.${DNS_ZONE}
+    EXCH_CLOSER_DOMAIN=exch-closer.${DNS_ZONE}
+  EXCH_TRANSFER_DOMAIN=exch-transfer.${DNS_ZONE}
+ EXCH_WIREWATCH_DOMAIN=exch-wirewatch.${DNS_ZONE}
 
 # Arguments to pass to all taler-exchange-* binaries at startup.
 # E.g. -L INFO
@@ -96,8 +104,12 @@ NUM_WALLET_PROCESSES=10
 # Start another bunch with `taler-perf start exchange <N>`
 NUM_EXCHANGE_PROCESSES=1
 
-# Number of wirewatch processes to run
+# Number of other exchange-* processes to run
 # This setting is static, default = 1
+# For the aggregator the number will be actually 2^n (so 0 will be 1 process)
+NUM_AGGREGATOR_PROCESSES=0
+    NUM_CLOSER_PROCESSES=1
+   NUM_TRANSER_PROCESSES=1
 NUM_WIREWATTCH_PROCESSES=1
 
 TALER_WALLET_SYNC_CRYPTO=1
diff --git a/experiment/scripts/exchange-aggregator.sh 
b/experiment/scripts/exchange-aggregator.sh
old mode 100644
new mode 100755
index 5faf8b6..5495be0
--- a/experiment/scripts/exchange-aggregator.sh
+++ b/experiment/scripts/exchange-aggregator.sh
@@ -7,19 +7,30 @@ OPT_MSG="
 init:
   Initialize the application(s) and start them
   uses NUM_AGGREGATOR_PROCESSES
+
+init-start:
+  Same as init but do not configure taler.conf,
+  just start the service
 "
 
 set -eux
 source ~/scripts/helpers.sh
 
-
+# Start N new exchange-aggregator processes
+# $1: N - number of new aggregators to start
+# NOTE: only for init purposes currently
 function start_aggregators() {
-  systemctl restart taler-exchange-aggregator.service
+  for i in $( seq $(echo "2^${1}" | bc) ); do
+    systemctl restart taler-exchange-aggregator@"${i}".service
+  done
 }
 
 case $1 in
   init)
-    setup_exchange_config
+    setup_exchange_config_master_key_from_api
+    start_aggregators "$NUM_AGGREGATOR_PROCESSES"
+    ;;
+  init-start)
     start_aggregators "$NUM_AGGREGATOR_PROCESSES"
     ;;
   *)
diff --git a/experiment/scripts/exchange-closer.sh 
b/experiment/scripts/exchange-closer.sh
old mode 100644
new mode 100755
index e69de29..732978b
--- a/experiment/scripts/exchange-closer.sh
+++ b/experiment/scripts/exchange-closer.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+INFO_MSG="
+Setup the Exchange Closer node
+Start taler-exchange-closer
+"
+OPT_MSG="
+init:
+  Initialize the application(s) and start them
+  uses NUM_CLOSER_PROCESSES
+
+init-start:
+  Same as init but do not configure taler.conf,
+  just start the service
+"
+
+set -eux
+source ~/scripts/helpers.sh
+
+# Start N new exchange-aggregator processes
+# $1: N - number of new aggregators to start
+# NOTE: only for init purposes currently
+function start_closers() {
+  for i in $(seq ${1}); do
+    systemctl restart taler-exchange-closer@"${i}".service
+  done
+}
+
+case $1 in
+  init)
+    setup_exchange_config_master_key_from_api
+    start_closers "$NUM_CLOSER_PROCESSES"
+    ;;
+  init-start)
+    start_closers "$NUM_CLOSER_PROCESSES"
+    ;;
+  *)
+    taler_perf_help $0 "$INFO_MSG" "$OPT_MSG"
+    ;;
+esac
+
+exit 0
diff --git a/experiment/scripts/exchange-transfer.sh 
b/experiment/scripts/exchange-transfer.sh
old mode 100644
new mode 100755
index e69de29..8a2d559
--- a/experiment/scripts/exchange-transfer.sh
+++ b/experiment/scripts/exchange-transfer.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+INFO_MSG="
+Setup the Exchange Transfer node
+Start taler-exchange-transfer
+"
+OPT_MSG="
+init:
+  Initialize the application(s) and start them
+  uses NUM_TRANSFER_PROCESSES
+
+init-start:
+  Same as init but do not configure taler.conf,
+  just start the service
+"
+
+set -eux
+source ~/scripts/helpers.sh
+
+# Start N new exchange-aggregator processes
+# $1: N - number of new aggregators to start
+# NOTE: only for init purposes currently
+function start_transfers() {
+  for i in $(seq ${1}); do
+    systemctl restart taler-exchange-transfer@"${i}".service
+  done
+}
+
+case $1 in
+  init)
+    setup_exchange_config_master_key_from_api
+    start_transfers "$NUM_TRANSFER_PROCESSES"
+    ;;
+  init-start)
+    start_transfers "$NUM_TRANSFER_PROCESSES"
+    ;;
+  *)
+    taler_perf_help $0 "$INFO_MSG" "$OPT_MSG"
+    ;;
+esac
+
+exit 0
diff --git a/experiment/scripts/exchange-wirewatch.sh 
b/experiment/scripts/exchange-wirewatch.sh
old mode 100644
new mode 100755
index e69de29..d687e44
--- a/experiment/scripts/exchange-wirewatch.sh
+++ b/experiment/scripts/exchange-wirewatch.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+INFO_MSG="
+Setup the Exchange Wirewatch node
+Start taler-exchange-wirewatch
+"
+OPT_MSG="
+init:
+  Initialize the application(s) and start them
+  uses NUM_WIREWATCH_PROCESSES
+
+init-start:
+  Same as init but do not configure taler.conf,
+  just start the service
+"
+
+set -eux
+source ~/scripts/helpers.sh
+
+# Start N new exchange-aggregator processes
+# $1: N - number of new aggregators to start
+# NOTE: only for init purposes currently
+function start_wirewatchers() {
+  for i in $(seq ${1}); do
+    systemctl restart taler-exchange-wirewatch@"${i}".service
+  done
+}
+
+case $1 in
+  init)
+    setup_exchange_config_master_key_from_api
+    start_wirewatchers "$NUM_TRANSFER_PROCESSES"
+    ;;
+  init-start)
+    start_wirewatchers "$NUM_TRANSFER_PROCESSES"
+    ;;
+  *)
+    taler_perf_help $0 "$INFO_MSG" "$OPT_MSG"
+    ;;
+esac
+
+exit 0
diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index 4dbc56b..a3d183c 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -1,18 +1,15 @@
 #!/bin/bash
 INFO_MSG="
 Setup the Exchange node
-Start taler-exchnage-* 
------
-  could change later to single nodes
-  for aggregator, wirewatch etc..
------
+Start taler-exchange-httpd 
+
 Each exchange-http daemon, will get its own port starting from 10001, 
 unless the first, this one will get port 80
 "
 OPT_MSG="
 init:
   Initialize the applications and start them
-  uses NUM_EXCHANGE_PROCESSES and NUM_WIREWATCH_PROCESSES
+  uses NUM_EXCHANGE_PROCESSES
 
 start NUM:
   Start another NUM exchange-http daemons
@@ -26,24 +23,38 @@ source ~/scripts/helpers.sh
 
 # Setup the configuration in /etc/taler
 function setup_config() {
-  sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@${DATABASE_DOMAIN}:${DB_PORT}/${DB_NAME}\g"
 \
-       /etc/taler/secrets/exchange-db.secret.conf
-  
-  sed -i "s/<BANK_HOST_HERE>/${BANK_DOMAIN}/g" \
-       /etc/taler/secrets/exchange-accountcredentials.secret.conf
-  
+
+  # Setup the base configuration (helpers.sh)
+  setup_exchange_config_without_master_key
+
   MASTER_KEY=$(sudo -u taler-exchange-offline taler-exchange-offline setup)
   
-  sed -i -e "s/<BANK_HOST_HERE>/${BANK_DOMAIN}/g" \
-         -e "s\<BASE_URL_HERE>\http://${EXCHANGE_DOMAIN}/\g"; \
-         -e "s/<MASTER_KEY_HERE>/${MASTER_KEY}/g" \
-         -e "s/<MAX_REQUESTS_HERE>/${EXCHANGE_MAX_REQUESTS:-8192}/g" \
+  sed -i -e "s/<MASTER_KEY_HERE>/${MASTER_KEY}/g" \
        /etc/taler/conf.d/exchange-business.conf
 }
 
+# Check if there are exchnage-* processes configured to be run
+# on external systems, if not start them here.
+function start_other_exchange_binaries() {
+  if [[ -z "${AGGREGATOR_HOSTS}" ]]; then
+    source ~/scripts/exchange-aggregator.sh init-start
+  fi
+  if [[ -z "${CLOSER_HOSTS}" ]]; then
+    source ~/scripts/exchange-closer.sh init-start
+  fi
+  if [[ -z "${TRANSFER_HOSTS}" ]]; then
+    source ~/scripts/exchange-transfer.sh init-start
+  fi
+  if [[ -z "${WIREWATCH_HOSTS}" ]]; then
+    source ~/scripts/exchange-wirewatch.sh init-start
+  fi
+}
+
 # Setup the exchange with the taler-exchange-offline signing procedure
 function setup_exchange() {
-  systemctl restart taler-exchange.target
+  systemctl restart taler-exchange-httpd@80.service
+
+  start_other_exchange_binaries
 
   wait_for_keys "${EXCHANGE_DOMAIN}/management"
 
@@ -67,8 +78,6 @@ function init_exchanges() {
   setup_config
   
   wait_for_db
-  # Wait another second to make sure user has permissions
-  sleep 5
 
   setup_exchange
 }
@@ -77,7 +86,7 @@ function init_exchanges() {
 # $1: N - number of new exchanges to start
 function start_exchanges() {
   # Get all currently running ones so the next free 
-  # port can be calculated - 10000 + RUNNING
+  # port can be calculated: 10000 + RUNNING
   RUNNING=$(ps -aux | grep "[taler]-exchange-httpd" | wc -l)
 
   # We cant do seq 0 n, if n=0 it would yield 0, thus do seq n and decrement
@@ -93,15 +102,6 @@ function start_exchanges() {
   done
 }
 
-# Start N new exchange-wirewatch processes
-# $1: N - number of new wirewatchers to start
-# NOTE: only for init purposes currently
-function start_wirewatchers() {
-  for i in $(seq ${1}); do
-    systemctl restart taler-exchange-wirewatch@"${i}".service
-  done
-}
-
 # Stop N exchange daemons 
 # $1: N -- number of exchanges to stop
 function stop_exchanges() {
@@ -111,9 +111,7 @@ function stop_exchanges() {
 case $1 in
   init)
     init_exchanges
-    # TODO adjust when started manually and not with .target
     start_exchanges "$((${NUM_EXCHANGE_PROCESSES}-1))"
-    start_wirewatchers "$((${NUM_WIREWATCH_PROCESSES}-1))"
     ;;
   start)
     start_exchanges $2
diff --git a/experiment/scripts/helpers.sh b/experiment/scripts/helpers.sh
index 168bc05..6fe470a 100755
--- a/experiment/scripts/helpers.sh
+++ b/experiment/scripts/helpers.sh
@@ -100,9 +100,11 @@ function wait_for_keys() {
   done
 } 
 
-function setup_exchange_config() {
+# Setup taler.conf for aggregator etc. with downloading the 
+# master public key from the exchange API 
+function setup_exchange_config_master_key_from_api() {
 
-  AGGREGATOR_SHARD_SIZE=$((4294967296 / ${NUM_AGGREGATOR_PROCESSES:-1}))
+  setup_exchange_config_without_master_key
 
   wait_for_keys "${PROXY_DOMAIN}"
 
@@ -112,6 +114,17 @@ function setup_exchange_config() {
        | jq -r '.master_public_key'
   )
 
+  sed -i -e "s/<MASTER_KEY_HERE>/${MASTER_KEY}/g" \
+       /etc/taler/conf.d/exchange-business.conf
+
+}
+
+# Setup taler.conf for any exchange-* process, does not configure
+# the master key
+function setup_exchange_config_without_master_key() {
+
+  AGGREGATOR_SHARD_SIZE=$(echo "2^(30-${NUM_AGGREGATOR_PROCESSES})" | bc)
+
   sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@${DATABASE_DOMAIN}:${DB_PORT}/${DB_NAME}\g"
 \
        /etc/taler/secrets/exchange-db.secret.conf
 
@@ -120,10 +133,10 @@ function setup_exchange_config() {
 
   sed -i -e "s/<BANK_HOST_HERE>/${BANK_DOMAIN}/g" \
          -e "s\<BASE_URL_HERE>\http://${EXCHANGE_DOMAIN}/\g"; \
-         -e "s/<MASTER_KEY_HERE>/${MASTER_KEY}/g" \
          -e "s/<MAX_REQUESTS_HERE>/${EXCHANGE_MAX_REQUESTS:-8192}/g" \
-        -e "s/<AGGREGATOR_SHARD_SIZE_HERE>/${AGGREGATOR_SHARD_SIZE}/g" \
+         -e "s/<AGGREGATOR_SHARD_SIZE_HERE>/${AGGREGATOR_SHARD_SIZE}/g" \
        /etc/taler/conf.d/exchange-business.conf
+
 }
 
 # Restart (enable) the rsyslog to send the logs to the monitoring
diff --git a/experiment/scripts/run.sh b/experiment/scripts/run.sh
index df938e6..742cf58 100644
--- a/experiment/scripts/run.sh
+++ b/experiment/scripts/run.sh
@@ -37,6 +37,34 @@ elif [[ "${HOSTNAME}" =~ ${EXCHANGE_HOSTS} ]]; then
     enable_logrotate
     enable_netdelay ${DATABASE_DOMAIN}
     exec ~/scripts/exchange.sh init
+elif [[ "${HOSTNAME}" =~ ${AGGREGATOR_HOSTS} ]]; then 
+    set_host exchange-aggregator
+    set_ddn ${EXCH_AGGREGATOR_DOMAIN}
+    setup_log
+    enable_logrotate
+    enable_netdelay ${DATABASE_DOMAIN}
+    exec ~/scripts/exchange-aggregator.sh init
+elif [[ "${HOSTNAME}" =~ ${CLOSER_HOSTS} ]]; then 
+    set_host exchange-closer
+    set_ddn ${EXCH_CLOSER_DOMAIN}
+    setup_log
+    enable_logrotate
+    enable_netdelay ${DATABASE_DOMAIN}
+    exec ~/scripts/exchange-closer.sh init
+elif [[ "${HOSTNAME}" =~ ${TRANSFER_HOSTS} ]]; then 
+    set_host exchange-transfer
+    set_ddn ${EXCH_TRANSFER_DOMAIN}
+    setup_log
+    enable_logrotate
+    enable_netdelay ${DATABASE_DOMAIN}
+    exec ~/scripts/exchange-transfer.sh init
+elif [[ "${HOSTNAME}" =~ ${WIREWATCH_HOSTS} ]]; then 
+    set_host exchange-wirewatch
+    set_ddn ${EXCH_WIREWATCH_DOMAIN}
+    setup_log
+    enable_logrotate
+    enable_netdelay ${DATABASE_DOMAIN}
+    exec ~/scripts/exchange-wirewatch.sh init
 elif [[ "${HOSTNAME}" =~ ${MERCHANT_HOSTS} ]]; then 
     set_host merchant
     set_ddn ${MERCHANT_DOMAIN}
diff --git a/experiment/taler.rspec b/experiment/taler.rspec
index 462f39a..5b3a3db 100644
--- a/experiment/taler.rspec
+++ b/experiment/taler.rspec
@@ -1,51 +1,51 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-11-25T12:41:28.205+01:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2022-03-09T15:46:24.102+01:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
   <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="156.0" 
y="70.0"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="203.0" 
y="96.5"/>
   </node>
   <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="283.0" 
y="127.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="274.0" 
y="164.5"/>
   </node>
   <node client_id="Bank" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="422.0" 
y="70.0"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="332.0" 
y="96.5"/>
   </node>
   <node client_id="Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="284.5" 
y="184.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="276.5" 
y="214.5"/>
   </node>
   <node client_id="Monitor" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="732.5" 
y="156.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="669.5" 
y="104.5"/>
   </node>
   <node client_id="Merchant" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="554.5" 
y="156.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="523.5" 
y="104.5"/>
   </node>
   <node client_id="DNS" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="638.0" 
y="70.0"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="599.0" 
y="47.5"/>
   </node>
   <node client_id="Wallet-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -167,4 +167,32 @@
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="700.0" 
y="420.0"/>
   </node>
+  <node client_id="Aggregator" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="dahu-grenoble"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="532.5" 
y="184.5"/>
+  </node>
+  <node client_id="Wirewatch" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="dahu-grenoble"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="535.5" 
y="220.5"/>
+  </node>
+  <node client_id="Transfer" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="dahu-grenoble"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="674.5" 
y="183.5"/>
+  </node>
+  <node client_id="Closer" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="dahu-grenoble"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="671.5" 
y="221.5"/>
+  </node>
 </rspec>
\ No newline at end of file

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