[taler-grid5k] 25/141: remove resolv.conf

[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 1a0492efebc1b7b7abc362f8fbee45b49b4ff735
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Oct 7 16:38:32 2021 +0200

    remove resolv.conf
---
 configs/etc/bind/named.conf.options | 16 ++++++++++++++++
 configs/etc/resolv.conf             |  2 --
 experiment/scripts/database.sh      |  2 +-
 experiment/setup.sh                 | 29 +++++++++++++++--------------
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/configs/etc/bind/named.conf.options 
b/configs/etc/bind/named.conf.options
new file mode 100644
index 0000000..c3ea4a7
--- /dev/null
+++ b/configs/etc/bind/named.conf.options
@@ -0,0 +1,16 @@
+options {
+       directory "/var/cache/bind";
+
+       //forwarders {
+       //    8.8.8.8;
+       //};
+
+       dnssec-validation auto;
+       
+       //recursion yes;
+
+       rrset_order { order random; };
+
+       listen-on-v6 { any; };
+};
+
diff --git a/configs/etc/resolv.conf b/configs/etc/resolv.conf
deleted file mode 100644
index f716a38..0000000
--- a/configs/etc/resolv.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-search perf.taler.
-nameserver <NAMESERVER_IP_HERE>
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index 8cc6b4f..40db66e 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -12,7 +12,7 @@ systemctl start postgresql
 su postgres << EOF
 createuser taler-exchange-httpd
 createdb -O taler-exchange-httpd ${DB_NAME}
-psql
+psql 
 create user "${DB_USER}" with encrypted password '${DB_PASSWORD}';
 EOF
 
diff --git a/experiment/setup.sh b/experiment/setup.sh
index 781aaa3..f4d5fb5 100755
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -26,18 +26,6 @@ send
 EOF
 }
 
-# Delete all old dns entries of the experitment
-while IFS='=' read -r name value; do
-  if [[ $name == *"_DOMAIN" && $value == *".${DNS_ZONE}" ]]; then 
-    nsupdate -k /root/ddns.key -v << EOF
-server ${NS_IP}
-zone ${DNS_ZONE}
-update delete ${value} A
-send
-EOF
-  fi
-done < <(env)
-
 # Temporarily checkout to the feature branch
 cd "${G5K_HOME}" && git checkout node-setup && git pull && cd
 
@@ -57,8 +45,21 @@ key "ddns-key.perf.taler" {
   secret "${DNS_HMAC_SHA256}";
 };
 EOF
-  
-  sed -i "s/<NAMESERVER_IP_HERE>/${NS_IP}/g" /etc/resolv.conf
+
+  sed -i "3i\\" 
+"nameserver ${NS_IP}" /etc/resolv.conf
+
+  # Delete all old dns entries of the experitment
+  while IFS='=' read -r name value; do
+    if [[ $name == *"_DOMAIN" && $value == *".${DNS_ZONE}" ]]; then 
+      nsupdate -k /root/ddns.key -v << EOF
+server ${NS_IP}
+zone ${DNS_ZONE}
+update delete ${value} A
+send
+EOF
+    fi
+  done < <(env)
 
   # wait for the dns to be initialized before continuing
   sleep 5

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