[taler-grid5k] 16/141: add var for bind

[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 d88e7cd2b2c32dce86c32cb3136163e955fe5879
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sun Oct 3 22:30:41 2021 +0200

    add var for bind
---
 etc/bind/named.conf.local        |  2 +-
 jfed/setup.sh                    | 13 +++++++------
 jfed/taler-perf.rspec            | 10 +++++-----
 {etc => var/lib}/bind/perf.taler |  0
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/etc/bind/named.conf.local b/etc/bind/named.conf.local
index 71f0655..f84c98e 100755
--- a/etc/bind/named.conf.local
+++ b/etc/bind/named.conf.local
@@ -5,7 +5,7 @@ key "ddns-key.perf.taler" {
 
 zone "perf.taler" {
   type master;
-  file "/etc/bind/perf.taler";
+  file "/var/lib/bind/perf.taler";
   update-policy {
     grant ddns-key.perf.taler subdomain perf.taler. ANY;
   };
diff --git a/jfed/setup.sh b/jfed/setup.sh
index cbbc7e4..1cac274 100755
--- a/jfed/setup.sh
+++ b/jfed/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Script run when a machine boots
-set -eua
+set -euax
 
 G5K_HOME=/root/grid5k
 
@@ -18,7 +18,7 @@ function set_ddn() {
   nsupdate -k /root/ddns.key -v << EOF
 server ${NS_IP}
 zone ${DNS_ZONE}
-update add ${1} 60 A $(hostname -I)
+update add $1 60 A $(hostname -I)
 send
 EOF
 }
@@ -28,13 +28,14 @@ source .env
 cat .env | tee -a /etc/environment
 
 # Temporarily checkout to the feature branch
-cd ${G5K_HOME} && git checkout node-setup && git pull && cd
+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}"/etc/* /etc
+cp -r "${G5K_HOME}"/var/* /var
 
 
-if [[ "${HOST}" != "${DNS_HOST}" ]]; then;
+if [[ "${HOST}" != "${DNS_HOST}" ]]; then
 
   # Add the dyndns key which will be used by the dns update
   cat << EOF > /root/ddns.key 
@@ -45,7 +46,7 @@ key "ddns-key.perf.taler" {
 EOF
   
   sed -i "3i\\
-  nameserver ${NS_IP}" /etc/resolv.conf
+nameserver ${NS_IP}" /etc/resolv.conf
 
   # wait for the dns to be initialized before continuing
   sleep 10
diff --git a/jfed/taler-perf.rspec b/jfed/taler-perf.rspec
index 37e5eac..e5893a5 100644
--- a/jfed/taler-perf.rspec
+++ b/jfed/taler-perf.rspec
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-03T19:51:28.760+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" 
component_id="urn:publicid:IDN+am.grid5000.fr+node+%2F3.0%2Fsites%2Fnancy%2Fclusters%2Fgros%2Fnodes%2Fgros-38">
+<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: 
[...]
+  <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>
@@ -18,14 +18,14 @@
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <hardware_type name="gros-nancy"/>
+    <hardware_type name="econome-nantes"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="202.5" 
y="465.5"/>
   </node>
-  <node client_id="Bank" 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%2Flyon%2Fclusters%2Fnova%2Fnodes%2Fnova-16">
+  <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="grcinq-nancy"/>
+    <hardware_type name="nova-lyon"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="295.0" 
y="249.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">
diff --git a/etc/bind/perf.taler b/var/lib/bind/perf.taler
old mode 100755
new mode 100644
similarity index 100%
rename from etc/bind/perf.taler
rename to var/lib/bind/perf.taler

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