[taler-grid5k] 29/141: run dns on taler.net

[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 ff6447c6bd7256d029e44acd272e2314cf09bee5
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sat Oct 9 17:15:47 2021 +0200

    run dns on taler.net
---
 configs/etc/bind/named.conf.local          | 12 -------
 configs/etc/bind/named.conf.options        | 17 ---------
 configs/var/lib/bind/perf.taler            | 15 --------
 experiment/{scripts/dns.sh => cleardns.sh} | 11 ++----
 experiment/env                             | 12 +++++--
 experiment/experiment-specification.yml    |  5 ++-
 experiment/run.sh                          | 32 +++++++++++++++++
 experiment/setup.sh                        | 56 ++++--------------------------
 experiment/taler-perf-any.rspec            |  8 +----
 experiment/taler-perf.rspec                |  9 +----
 10 files changed, 55 insertions(+), 122 deletions(-)

diff --git a/configs/etc/bind/named.conf.local 
b/configs/etc/bind/named.conf.local
deleted file mode 100755
index f84c98e..0000000
--- a/configs/etc/bind/named.conf.local
+++ /dev/null
@@ -1,12 +0,0 @@
-key "ddns-key.perf.taler" {
-  algorithm hmac-sha256;
-  secret "<DNS_KEY_HERE>";
-};
-
-zone "perf.taler" {
-  type master;
-  file "/var/lib/bind/perf.taler";
-  update-policy {
-    grant ddns-key.perf.taler subdomain perf.taler. ANY;
-  };
-};
diff --git a/configs/etc/bind/named.conf.options 
b/configs/etc/bind/named.conf.options
deleted file mode 100644
index c2c2305..0000000
--- a/configs/etc/bind/named.conf.options
+++ /dev/null
@@ -1,17 +0,0 @@
-acl grid5000 {
-        172.16.0.0/12;
-       localhost;
-};
-
-options {
-        directory "/var/cache/bind";
-
-        allow-query { grid5000; };
-        allow-update { grid5000; };
-
-        dnssec-validation auto;
-
-        rrset-order { order random; };
-
-        listen-on-v6 { any; };
-};
diff --git a/configs/var/lib/bind/perf.taler b/configs/var/lib/bind/perf.taler
deleted file mode 100644
index 6846c58..0000000
--- a/configs/var/lib/bind/perf.taler
+++ /dev/null
@@ -1,15 +0,0 @@
-$ORIGIN .
-$TTL 60 ; 
-perf.taler IN SOA ns1.perf.taler. admin.perf.taler. (
-    202110031;
-    604800;
-    86400;
-    2419200;
-    604800; 
-    )
-
-  NS ns1.perf.taler.
-
-$ORIGIN perf.taler.
-
-ns1 A 127.0.0.1
diff --git a/experiment/scripts/dns.sh b/experiment/cleardns.sh
old mode 100755
new mode 100644
similarity index 58%
rename from experiment/scripts/dns.sh
rename to experiment/cleardns.sh
index 40c9d18..9ba530f
--- a/experiment/scripts/dns.sh
+++ b/experiment/cleardns.sh
@@ -1,14 +1,8 @@
 #!/bin/bash
+# Clears the DNS server for the new experiment
 set -eux
 
-sed -i "s/<DNS_KEY_HERE>/${DNS_HMAC_SHA256}/g" \
-    /etc/bind/named.conf.local
-
-systemctl restart named.service
-
-sleep 3
-
-# Delete all old dns entries of the experitment
+# Delete all old dns entries of the previous experitment
 while IFS='=' read -r name value; do
   if [[ $name == *"_DOMAIN" && $value == *".${DNS_ZONE}" ]]; then 
     nsupdate -k /root/ddns.key -v << EOF
@@ -20,4 +14,3 @@ EOF
   fi
 done < <(env)
 
-exit 0
diff --git a/experiment/env b/experiment/env
index 12ea96f..6c894e4 100755
--- a/experiment/env
+++ b/experiment/env
@@ -4,10 +4,16 @@ PROXY_HOSTS=
 BANK_HOSTS=
 WALLET_HOSTS=
 
-DNS_HOST=
+DNS_HOST=taler.net
+DNS_ZONE=perf.taler
 
-DB_NAME=
-DB_USER=
+PROXY_DOMAIN=proxy.perf.taler
+EXCHANGE_DOMAIN=exch.perf.taler
+DATABASE_DOMAIN=db.perf.taler
+BANK_DOMAIN=bank.perf.taler
+
+DB_NAME=taler-exchange
+DB_USER=taler
 DB_PASSWORD=
 
 DNS_HMAC_SHA256=
diff --git a/experiment/experiment-specification.yml 
b/experiment/experiment-specification.yml
index ed3f3da..04fb8c3 100755
--- a/experiment/experiment-specification.yml
+++ b/experiment/experiment-specification.yml
@@ -6,4 +6,7 @@ upload:
   - bundled: scripts
     permission: "774"
 execute:
-  - setup.sh
+  - bundled: setup.sh
+  - bundles: cleardns.sh
+    nodes: [Exchange]
+  - bundled: run.sh
diff --git a/experiment/run.sh b/experiment/run.sh
new file mode 100644
index 0000000..0cb6d5b
--- /dev/null
+++ b/experiment/run.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# Run the experitment
+set -eux
+
+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
+
+exit 0
diff --git a/experiment/setup.sh b/experiment/setup.sh
index 3122ab1..9c73a4b 100755
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Setup the experiment
 set -euax
 
 # Load the environment configuration
@@ -7,13 +8,6 @@ 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}
-DNS_DOMAIN=dns.${DNS_ZONE}
-
 NS_IP=$(host ${DNS_HOST} | sed -n 1p | awk '{print $4}')
 
 # Set a dynamic domain name in our own dns
@@ -35,7 +29,6 @@ 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
 
 # Add the dyndns key which will be used by the dns update
 cat << EOF > /root/ddns.key 
@@ -45,49 +38,12 @@ key "ddns-key.perf.taler" {
 };
 EOF
 
-if [[ "${HOSTNAME}" != "${DNS_HOST}" ]]; then
-
-  if ! grep -Fxq "nameserver ${NS_IP}" /etc/resolv.conf ; then
-    sed -i "3i\\
+# Add our DNS on taler.net as the first nameserver 
+# if it is not there yet
+if ! grep -Fxq "nameserver ${NS_IP}" /etc/resolv.conf ; then
+  sed -i "3i\\
 nameserver ${NS_IP}" /etc/resolv.conf
-  fi
-
-  until host -r "${DNS_DOMAIN}"; do
-    echo "DNS not ready yet"
-    sleep 1
-  done
-
-  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"
-  /bin/bash ~/scripts/dns.sh
-  set_ddn ${DNS_DOMAIN}
 fi
 
 exit 0
+
diff --git a/experiment/taler-perf-any.rspec b/experiment/taler-perf-any.rspec
index 245ed53..24335b6 100644
--- a/experiment/taler-perf-any.rspec
+++ b/experiment/taler-perf-any.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-07T21:58:38.715+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-09T17:10:59.347+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"/>
@@ -24,12 +24,6 @@
     </sliver_type>
     <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">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
-    </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="920.0" 
y="142.5"/>
-  </node>
   <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"/>
diff --git a/experiment/taler-perf.rspec b/experiment/taler-perf.rspec
index cb7ff57..28c6405 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-07T12:10:47.404+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-09T17:10:45.615+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"/>
@@ -28,13 +28,6 @@
     <hardware_type name="nova-lyon"/>
     <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">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
-    </sliver_type>
-    <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="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"/>

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