[taler-grid5k] 22/141: add proxy

[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 ebcf853a0efc0032b79d428c23fec4237109df08
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed Oct 6 14:39:38 2021 +0200

    add proxy
---
 {etc => configs/etc}/bind/named.conf.local         |  0
 .../etc/nginx/sites-available/exchange             |  0
 .../etc/nginx/sites-available/proxy                |  2 +-
 .../etc}/taler/conf.d/exchange-business.conf       |  0
 .../etc}/taler/conf.d/exchange-coins.conf          |  0
 .../etc}/taler/conf.d/exchange-system.conf         |  0
 {etc => configs/etc}/taler/conf.d/fake-bank.conf   |  0
 {etc => configs/etc}/taler/overrides.conf          |  0
 .../exchange-accountcredentials.secret.conf        |  0
 .../etc}/taler/secrets/exchange-db.secret.conf     |  0
 {etc => configs/etc}/taler/taler.conf              |  0
 {var => configs/var}/lib/bind/perf.taler           |  0
 {jfed => experiment}/.gitignore                    |  0
 {jfed => experiment}/README                        |  0
 {jfed => experiment}/env                           |  1 +
 experiment/experiment-specification.yml            |  9 +++
 experiment/scripts/bank.sh                         |  5 ++
 {scripts => experiment/scripts}/database.sh        |  0
 {scripts => experiment/scripts}/dns.sh             |  0
 {scripts => experiment/scripts}/exchange.sh        | 28 ++++++---
 experiment/scripts/proxy.sh                        |  6 ++
 experiment/scripts/wallet.sh                       |  7 +++
 {jfed => experiment}/setup.sh                      | 72 ++++++++++++----------
 {jfed => experiment}/taler-perf.rspec              | 23 ++++---
 jfed/experiment-specification.yml                  |  6 --
 scripts/bank.sh                                    |  5 --
 scripts/wallet.sh                                  |  1 -
 27 files changed, 103 insertions(+), 62 deletions(-)

diff --git a/etc/bind/named.conf.local b/configs/etc/bind/named.conf.local
similarity index 100%
rename from etc/bind/named.conf.local
rename to configs/etc/bind/named.conf.local
diff --git a/etc/nginx/sites-enabled/default 
b/configs/etc/nginx/sites-available/exchange
similarity index 100%
copy from etc/nginx/sites-enabled/default
copy to configs/etc/nginx/sites-available/exchange
diff --git a/etc/nginx/sites-enabled/default 
b/configs/etc/nginx/sites-available/proxy
similarity index 76%
rename from etc/nginx/sites-enabled/default
rename to configs/etc/nginx/sites-available/proxy
index d776ca4..3d28add 100644
--- a/etc/nginx/sites-enabled/default
+++ b/configs/etc/nginx/sites-available/proxy
@@ -5,7 +5,7 @@ server {
   server_name localhost;
 
   location / {
-     proxy_pass http://unix:/run/taler/exchange-httpd/exchange-http.sock:/;
+     proxy_pass <EXCHANGE_URL_HERE>;
      proxy_redirect off;
      proxy_set_header Host $host;
      #proxy_set_header X-Forwarded-Host "example.com";
diff --git a/etc/taler/conf.d/exchange-business.conf 
b/configs/etc/taler/conf.d/exchange-business.conf
similarity index 100%
rename from etc/taler/conf.d/exchange-business.conf
rename to configs/etc/taler/conf.d/exchange-business.conf
diff --git a/etc/taler/conf.d/exchange-coins.conf 
b/configs/etc/taler/conf.d/exchange-coins.conf
similarity index 100%
rename from etc/taler/conf.d/exchange-coins.conf
rename to configs/etc/taler/conf.d/exchange-coins.conf
diff --git a/etc/taler/conf.d/exchange-system.conf 
b/configs/etc/taler/conf.d/exchange-system.conf
similarity index 100%
rename from etc/taler/conf.d/exchange-system.conf
rename to configs/etc/taler/conf.d/exchange-system.conf
diff --git a/etc/taler/conf.d/fake-bank.conf 
b/configs/etc/taler/conf.d/fake-bank.conf
similarity index 100%
rename from etc/taler/conf.d/fake-bank.conf
rename to configs/etc/taler/conf.d/fake-bank.conf
diff --git a/etc/taler/overrides.conf b/configs/etc/taler/overrides.conf
similarity index 100%
rename from etc/taler/overrides.conf
rename to configs/etc/taler/overrides.conf
diff --git a/etc/taler/secrets/exchange-accountcredentials.secret.conf 
b/configs/etc/taler/secrets/exchange-accountcredentials.secret.conf
similarity index 100%
rename from etc/taler/secrets/exchange-accountcredentials.secret.conf
rename to configs/etc/taler/secrets/exchange-accountcredentials.secret.conf
diff --git a/etc/taler/secrets/exchange-db.secret.conf 
b/configs/etc/taler/secrets/exchange-db.secret.conf
similarity index 100%
rename from etc/taler/secrets/exchange-db.secret.conf
rename to configs/etc/taler/secrets/exchange-db.secret.conf
diff --git a/etc/taler/taler.conf b/configs/etc/taler/taler.conf
similarity index 100%
rename from etc/taler/taler.conf
rename to configs/etc/taler/taler.conf
diff --git a/var/lib/bind/perf.taler b/configs/var/lib/bind/perf.taler
similarity index 100%
rename from var/lib/bind/perf.taler
rename to configs/var/lib/bind/perf.taler
diff --git a/jfed/.gitignore b/experiment/.gitignore
similarity index 100%
rename from jfed/.gitignore
rename to experiment/.gitignore
diff --git a/jfed/README b/experiment/README
similarity index 100%
rename from jfed/README
rename to experiment/README
diff --git a/jfed/env b/experiment/env
similarity index 90%
rename from jfed/env
rename to experiment/env
index 475bf55..12ea96f 100755
--- a/jfed/env
+++ b/experiment/env
@@ -1,5 +1,6 @@
 DATABASE_HOSTS=
 EXCHANGE_HOSTS=
+PROXY_HOSTS=
 BANK_HOSTS=
 WALLET_HOSTS=
 
diff --git a/experiment/experiment-specification.yml 
b/experiment/experiment-specification.yml
new file mode 100755
index 0000000..ed3f3da
--- /dev/null
+++ b/experiment/experiment-specification.yml
@@ -0,0 +1,9 @@
+version: 1.0-basic
+rspec: 
+  - bundled: taler-perf.rspec
+upload: 
+  - bundled: .env
+  - bundled: scripts
+    permission: "774"
+execute:
+  - setup.sh
diff --git a/experiment/scripts/bank.sh b/experiment/scripts/bank.sh
new file mode 100755
index 0000000..67d9af4
--- /dev/null
+++ b/experiment/scripts/bank.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+taler-fakebank-run -c /etc/taler/taler.conf > bank.log 2>&1 & disown
+
+exit 0
diff --git a/scripts/database.sh b/experiment/scripts/database.sh
similarity index 100%
rename from scripts/database.sh
rename to experiment/scripts/database.sh
diff --git a/scripts/dns.sh b/experiment/scripts/dns.sh
similarity index 100%
rename from scripts/dns.sh
rename to experiment/scripts/dns.sh
diff --git a/scripts/exchange.sh b/experiment/scripts/exchange.sh
similarity index 70%
rename from scripts/exchange.sh
rename to experiment/scripts/exchange.sh
index 957046a..0354b09 100755
--- a/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -6,9 +6,20 @@ sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@${DATABASE_DOMAIN
 
 sed -i "s/<BANK_HOST_HERE>/${BANK_DOMAIN}/g" \
        /etc/taler/secrets/exchange-accountcredentials.secret.conf
+
 sed -i "s/<BANK_HOST_HERE>/${BANK_DOMAIN}/g" \
        /etc/taler/conf.d/exchange-business.conf
 
+sed -i "s\<BASE_URL_HERE>\http://${EXCHANGE_DOMAIN}/\g"; \
+       /etc/taler/conf.d/exchange-business.conf
+
+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
+
 until PGPASSWORD="${DB_PASSWORD}" psql \
       -h "${DATABASE_DOMAIN}" \
       -U "${DB_USER}" \
@@ -31,15 +42,16 @@ GRANT USAGE ON ALL SEQUENCES IN SCHEMA public TO 
"taler-exchange-closer";
 GRANT USAGE ON ALL SEQUENCES IN SCHEMA public TO "taler-exchange-wire";
 EOF
 
-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
-sed -i "s\<BASE_URL_HERE>\http://$(hostname)\g" \
-       /etc/taler/conf.d/exchange-business.conf
-
 systemctl start taler-exchange.target nginx
 
-wget http://$(hostname)/management/keys
+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 upload < sig-res.json
+taler-exchange-offline upload < acct-res.json
+taler-exchange-offline upload < fee-res.json
 
 exit 0
diff --git a/experiment/scripts/proxy.sh b/experiment/scripts/proxy.sh
new file mode 100755
index 0000000..caeeb28
--- /dev/null
+++ b/experiment/scripts/proxy.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -eu
+
+sed "s\<EXCHANGE_URL_HERE>\http://${EXCHNAGE_DOMAIN}\g"; > 
/etc/nginx/sites-enabled/proxy
+
+systemctl restart nginx
diff --git a/experiment/scripts/wallet.sh b/experiment/scripts/wallet.sh
new file mode 100755
index 0000000..b65415b
--- /dev/null
+++ b/experiment/scripts/wallet.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -eu
+
+sleep 5
+
+taler-wallet-cli advanced withdraw-manually --exchange 
http://${EXCHANGE_DOMAIN}/ --amount KUDOS:10
+
diff --git a/jfed/setup.sh b/experiment/setup.sh
similarity index 55%
rename from jfed/setup.sh
rename to experiment/setup.sh
index 14f929c..10a32fb 100755
--- a/jfed/setup.sh
+++ b/experiment/setup.sh
@@ -9,12 +9,11 @@ cat .env | tee -a /etc/environment
 G5K_HOME=/root/grid5k
 
 DNS_ZONE=perf.taler
+PROXY_DOMAIN=proxy.${DNS_ZONE}
 EXCHANGE_DOMAIN=exch.${DNS_ZONE}
 DATABASE_DOMAIN=db.${DNS_ZONE}
 BANK_DOMAIN=bank.${DNS_ZONE}
 
-HOST=$(hostname)
-
 NS_IP=$(host ${DNS_HOST} | sed -n 1p | awk '{print $4}')
 
 # Set a dynamic domain name in our own dns - excepts the domain to be passed
@@ -30,12 +29,14 @@ EOF
 # Temporarily checkout to the feature branch
 cd "${G5K_HOME}" && git checkout node-setup && git pull && cd
 
-# Override default /etc/ with the one from this Git.
-cp -r "${G5K_HOME}"/etc/* /etc
-cp -r "${G5K_HOME}"/var/* /var
+# Remove default nginx config
+rm /etc/nginx/sites-enabled/default > /dev/null 2>&1 || true
 
+# Override default /etc/ with the one from this Git.
+cp -r "${G5K_HOME}"/configs/etc/* /etc
+cp -r "${G5K_HOME}"/configs/var/* /var
 
-if [[ "${HOST}" != "${DNS_HOST}" ]]; then
+if [[ "${HOSTNAME}" != "${DNS_HOST}" ]]; then
 
   # Add the dyndns key which will be used by the dns update
   cat << EOF > /root/ddns.key 
@@ -51,33 +52,38 @@ nameserver ${NS_IP}" /etc/resolv.conf
   fi
 
   # wait for the dns to be initialized before continuing
-  sleep 10
-fi
+  sleep 5
 
-case "${HOST}" in 
-  ${DNS_HOST}) 
-    echo "DNS"
-    exec ${G5K_HOME}/scripts/dns.sh
-    ;;
-  ${BANK_HOSTS}) 
-    echo "BANK"
-    set_ddn ${BANK_DOMAIN}
-    exec ${G5K_HOME}/scripts/bank.sh
-    ;;
-  ${WALLET_HOSTS}) 
-    echo "WALLET"
-    exec ${G5K_HOME}/scripts/wallet.sh 
-    ;;
-  ${DATABASE_HOSTS}) 
-    echo "DATABASE"
-    set_ddn ${DATABASE_DOMAIN}
-    exec ${G5K_HOME}/scripts/database.sh 
-    ;;
-  ${EXCHANGE_HOSTS}) 
-    echo "EXCHANGE"
-    set_ddn ${EXCHANGE_DOMAIN}
-    exec ${G5K_HOME}/scripts/exchange.sh 
-    ;;
-esac
+  case "${HOSTNAME}" in 
+    ${BANK_HOSTS}) 
+      echo "BANK"
+      set_ddn ${BANK_DOMAIN}
+      exec ~/scripts/bank.sh
+      ;;
+    ${WALLET_HOSTS}) 
+      echo "WALLET"
+      exec ~/scripts/wallet.sh 
+      ;;
+    ${DATABASE_HOSTS}) 
+      echo "DATABASE"
+      set_ddn ${DATABASE_DOMAIN}
+      exec ~/scripts/database.sh 
+      ;;
+    ${PROXY_HOSTS})
+      echo "PROXY"
+      set_ddn ${PROXY_DOMAIN}
+      exec ~/scripts/proxy.sh
+      ;;
+    ${EXCHANGE_HOSTS}) 
+      echo "EXCHANGE"
+      set_ddn ${EXCHANGE_DOMAIN}
+      exec ~/scripts/exchange.sh 
+      ;;
+  esac
+ 
+else
+  echo "DNS"
+  exec ~/scripts/dns.sh
+fi
 
 exit 0
diff --git a/jfed/taler-perf.rspec b/experiment/taler-perf.rspec
similarity index 77%
rename from jfed/taler-perf.rspec
rename to experiment/taler-perf.rspec
index e5893a5..fed0b27 100644
--- a/jfed/taler-perf.rspec
+++ b/experiment/taler-perf.rspec
@@ -1,38 +1,45 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-03T21:54:25.681+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-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: 
[...]
   <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"/>
     </sliver_type>
     <hardware_type name="gros-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="146.0" 
y="251.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="514.0" 
y="84.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.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <hardware_type name="graphite-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="212.56378600823044" y="359.51094890510944"/>
+    <hardware_type name="grisou-nancy"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="611.0" 
y="303.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="202.5" 
y="465.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="612.5" 
y="604.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.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="nova-lyon"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="295.0" 
y="249.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="699.0" 
y="82.5"/>
   </node>
-  <node client_id="DNS" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am" 
component_id="urn:publicid:IDN+am.grid5000.fr+node+%2F3.0%2Fsites%2Fsophia%2Fclusters%2Fuvb%2Fnodes%2Fuvb-44">
+  <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.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="387.0" 
y="357.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="926.0" 
y="158.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.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"/>
   </node>
 </rspec>
\ No newline at end of file
diff --git a/jfed/experiment-specification.yml 
b/jfed/experiment-specification.yml
deleted file mode 100755
index 7266cf2..0000000
--- a/jfed/experiment-specification.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-version: 1.0-basic
-rspec: taler-perf.rspec
-upload: 
-   - .env
-execute:
-   - setup.sh
diff --git a/scripts/bank.sh b/scripts/bank.sh
deleted file mode 100755
index e0b21da..0000000
--- a/scripts/bank.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-taler-fakebank-run -c /etc/taler/taler.conf 2>&1 > bank.log & disown
-
-exit 0
diff --git a/scripts/wallet.sh b/scripts/wallet.sh
deleted file mode 100755
index a9bf588..0000000
--- a/scripts/wallet.sh
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/bash

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