[taler-grid5k] 23/141: fix scripts

[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 efc1a9f2e41907511ca995e44ba35693a818a730
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed Oct 6 17:53:12 2021 +0200

    fix scripts
---
 experiment/scripts/bank.sh                       |  3 ++-
 experiment/scripts/database.sh                   |  1 +
 experiment/scripts/dns.sh                        |  1 +
 experiment/scripts/exchange.sh                   |  6 +++---
 experiment/scripts/proxy.sh                      | 15 +++++++++++++--
 experiment/scripts/wallet.sh                     | 12 +++++++++---
 experiment/setup.sh                              |  2 +-
 experiment/taler-perf.rspec                      | 16 ++++++++--------
 image/grid5000/steps/data/taler-fakebank.service | 11 +++++++++++
 image/taler-debian11.yaml                        |  7 ++++++-
 10 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/experiment/scripts/bank.sh b/experiment/scripts/bank.sh
index 67d9af4..5458af2 100755
--- a/experiment/scripts/bank.sh
+++ b/experiment/scripts/bank.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
+set -eux
 
-taler-fakebank-run -c /etc/taler/taler.conf > bank.log 2>&1 & disown
+systemctl restart taler-fakebank.service
 
 exit 0
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index 6c4e497..3bc5a74 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eux
 
 echo "listen_addresses='*'" >> /etc/postgresql/13/main/postgresql.conf
 echo "host all all 172.16.0.0/16 md5" >> /etc/postgresql/13/main/pg_hba.conf
diff --git a/experiment/scripts/dns.sh b/experiment/scripts/dns.sh
index ba8a8db..f967fd4 100755
--- a/experiment/scripts/dns.sh
+++ b/experiment/scripts/dns.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eux
 
 sed -i "s/<DNS_KEY_HERE>/${DNS_HMAC_SHA256}/g" \
     /etc/bind/named.conf.local
diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index 0354b09..7518a44 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eu
+set -eux
 
 sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@${DATABASE_DOMAIN}/${DB_NAME}\g"
 \
        /etc/taler/secrets/exchange-db.secret.conf
@@ -18,7 +18,7 @@ MASTER_KEY=$(sudo -u taler-exchange-offline 
taler-exchange-offline setup)
 sed -i "s/<MASTER_KEY_HERE>/${MASTER_KEY}/g" \
        /etc/taler/conf.d/exchange-business.conf
 
-ln -s /etc/nginx/sites-available/exchange /etc/nginx/sites-enabled/exchange
+ln -sf /etc/nginx/sites-available/exchange /etc/nginx/sites-enabled/exchange
 
 until PGPASSWORD="${DB_PASSWORD}" psql \
       -h "${DATABASE_DOMAIN}" \
@@ -49,7 +49,7 @@ wget http://${EXCHANGE_DOMAIN}/management/keys
 taler-exchange-offline download > sig-req.json
 taler-exchange-offline sign < sig-req.json > sig-res.json
 taler-exchange-offline enable-account $(taler-config -s exchange-account-1 -o 
payto_uri) > acct-res.json
-taler-exchange-offline wire-fee 2021 x-taler-bank KUDOS:0 KUDOS:0 > 
fee-resp.json
+taler-exchange-offline wire-fee 2021 x-taler-bank KUDOS:0 KUDOS:0 > 
fee-res.json
 taler-exchange-offline upload < sig-res.json
 taler-exchange-offline upload < acct-res.json
 taler-exchange-offline upload < fee-res.json
diff --git a/experiment/scripts/proxy.sh b/experiment/scripts/proxy.sh
index caeeb28..cad6cb3 100755
--- a/experiment/scripts/proxy.sh
+++ b/experiment/scripts/proxy.sh
@@ -1,6 +1,17 @@
 #!/bin/bash
-set -eu
+set -eux
 
-sed "s\<EXCHANGE_URL_HERE>\http://${EXCHNAGE_DOMAIN}\g"; > 
/etc/nginx/sites-enabled/proxy
+sed "s\<EXCHANGE_URL_HERE>\http://${EXCHANGE_DOMAIN}\g"; \
+       /etc/nginx/sites-available/proxy > /etc/nginx/sites-enabled/proxy
+
+# Nginx does not start until the destination server is reachable - wait here 
+# nginx: [emerg] host not found in upstream "exch.perf.taler" ...
+until wget http://${PROXY_DOMAIN}/management/keys \
+       --spider \
+       -q;
+do
+  echo "Exchange not ready yet"
+  sleep 5
+done
 
 systemctl restart nginx
diff --git a/experiment/scripts/wallet.sh b/experiment/scripts/wallet.sh
index b65415b..1a87566 100755
--- a/experiment/scripts/wallet.sh
+++ b/experiment/scripts/wallet.sh
@@ -1,7 +1,13 @@
 #!/bin/bash
-set -eu
+set -eux
 
-sleep 5
+until wget http://${PROXY_DOMAIN}/management/keys \
+       --spider \
+       -q;
+do
+  echo "Exchange not ready yet"
+  sleep 5
+done
 
-taler-wallet-cli advanced withdraw-manually --exchange 
http://${EXCHANGE_DOMAIN}/ --amount KUDOS:10
+taler-wallet-cli advanced withdraw-manually --exchange http://${PROXY_DOMAIN}/ 
--amount KUDOS:10
 
diff --git a/experiment/setup.sh b/experiment/setup.sh
index 10a32fb..798af18 100755
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Script run when a machine boots
-set -eua
+set -euax
 
 # Load the environment configuration
 source .env
diff --git a/experiment/taler-perf.rspec b/experiment/taler-perf.rspec
index fed0b27..0efc614 100644
--- a/experiment/taler-perf.rspec
+++ b/experiment/taler-perf.rspec
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-06T14:38:41.934+02: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="2021-10-06T17:00:08.895+02: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.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
@@ -11,15 +11,15 @@
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <hardware_type name="grisou-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="611.0" 
y="303.5"/>
+    <hardware_type name="grcinq-nancy"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="607.0" 
y="188.5"/>
   </node>
   <node client_id="Wallet" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="econome-nantes"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="612.5" 
y="604.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="607.5" 
y="347.5"/>
   </node>
   <node client_id="Bank" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -32,14 +32,14 @@
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <hardware_type name="grisou-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="926.0" 
y="158.5"/>
+    <hardware_type name="graoully-nancy"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="920.0" 
y="142.5"/>
   </node>
-  <node client_id="Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Exch-Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="grappe-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="611.5" 
y="456.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="603.5" 
y="226.5"/>
   </node>
 </rspec>
\ No newline at end of file
diff --git a/image/grid5000/steps/data/taler-fakebank.service 
b/image/grid5000/steps/data/taler-fakebank.service
new file mode 100644
index 0000000..15c10dc
--- /dev/null
+++ b/image/grid5000/steps/data/taler-fakebank.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=GNU Taler fake bank 
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/taler-fakebank-run -c /etc/taler/taler.conf
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target
diff --git a/image/taler-debian11.yaml b/image/taler-debian11.yaml
index aae3b3b..e3f57ed 100644
--- a/image/taler-debian11.yaml
+++ b/image/taler-debian11.yaml
@@ -20,7 +20,7 @@ global:
 
   ## Environment description customization
   ## Author
-  g5k_author: "grothoff@gnu.org"
+  g5k_author: "bossm8@bfh.ch"
   ## Version
   g5k_version: 2
   ## Environment image path and compression
@@ -62,6 +62,11 @@ setup:
          apt-get update
          apt-upgrade
          apt-get install -y $${other_packages_no_clean}
+    - add_files:
+      - local2in:
+        - $$kameleon_data_dir/taler-fakebank.service
+        - /etc/systemd/system/taler-fakebank.service
+      - exec_in: chmod 640 /etc/systemd/system/taler-fakebank.service
     - disable_services:
       - exec_in: |
          systemctl daemon-reload

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