[taler-grid5k] 13/16: use global forwarders

[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 768bb65d551b25568d248762b801621fb4874d31
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Mon Nov 22 23:10:18 2021 +0100

    use global forwarders
---
 configs/etc/bind/named.conf.local   |  7 -------
 configs/etc/bind/named.conf.options | 24 ++++++++++++++----------
 experiment/scripts/dns.sh           |  2 ++
 experiment/scripts/setup.sh         | 12 ++++++------
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/configs/etc/bind/named.conf.local 
b/configs/etc/bind/named.conf.local
index efac4f8..283acd6 100644
--- a/configs/etc/bind/named.conf.local
+++ b/configs/etc/bind/named.conf.local
@@ -6,10 +6,3 @@ zone "<DNS_ZONE_HERE>" {
     127.0.0.0/8;
   };
 };
-
-zone "grid5000.fr" {
-  type forward;
-  forwarders {
-    <GRID_DNS_HERE>
-  };
-};
diff --git a/configs/etc/bind/named.conf.options 
b/configs/etc/bind/named.conf.options
index 74ef82b..cae6567 100644
--- a/configs/etc/bind/named.conf.options
+++ b/configs/etc/bind/named.conf.options
@@ -1,19 +1,23 @@
 acl grid5000 {
-        172.16.0.0/12;
-       127.0.0.0/8;
+  172.16.0.0/12;
+  127.0.0.0/8;
 };
 
 options {
-        directory "/var/cache/bind";
+  directory "/var/cache/bind";
 
-        allow-query { grid5000; };
-        allow-update { grid5000; };
-         
-        dnssec-enable yes;
-        dnssec-validation yes;
+  allow-query { grid5000; };
+  allow-update { grid5000; };
+   
+  dnssec-enable yes;
+  dnssec-validation yes;
 
-        rrset-order { order random; };
+  rrset-order { order random; };
 
-        listen-on-v6 { any; };
+  listen-on-v6 { any; };
+
+  forwarders {
+    <GRID_DNS_HERE>
+  };
 };
 
diff --git a/experiment/scripts/dns.sh b/experiment/scripts/dns.sh
index 274d85b..06c01ff 100644
--- a/experiment/scripts/dns.sh
+++ b/experiment/scripts/dns.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -eux
 
+# Stop dnsmasq just to be save
+systemctl stop dnsmasq
 systemctl restart named
 
 # Make sure the dns is ready
diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index e4d67ed..e8a6c10 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -33,10 +33,10 @@ cp -r "${G5K_HOME}"/configs/* /
 
 # Send all logs about taler to promtail on the monitoring node
 sed -i -e "s/<MONITOR_DOMAIN_HERE>/${MONITOR_DOMAIN}/g" \
-       -e "s/<LOG_DIR_HERE>/${LOG_DIR}/g" \
+       -e "s|<LOG_DIR_HERE>|${LOG_DIR}|g" \
        /etc/rsyslog.d/taler.conf
 
-sed -i "s/<LOG_DIR_HERE>/${LOG_DIR}/g" \
+sed -i "s|<LOG_DIR_HERE>|${LOG_DIR}|g" \
         /etc/logrotate.d/taler
 
 sed -i "s/<ARGUMENTS_HERE>/${EXCHANGE_ARGS}/g" \
@@ -52,10 +52,10 @@ if ! grep -Fxq "nameserver 127.0.0.1" /etc/resolv.conf ; 
then
 fi
 
 BIND_SERVERS=$(grep nameserver /etc/resolv.conf.bak | awk '{print $2}' ORS='; 
')
-sed -i -e "s/<GRID_DNS_HERE>/${BIND_SERVERS}/g" \
-       -e "s/<DNS_ZONE_HERE>/${DNS_ZONE}/g" \
-           /etc/bind/named.conf.local
-
+sed -i "s/<DNS_ZONE_HERE>/${DNS_ZONE}/g" \
+        /etc/bind/named.conf.local
+sed -i "s/<GRID_DNS_HERE>/${BIND_SERVERS}/g" \
+        /etc/bind/named.conf.options
 sed -i "s/<DNS_ZONE_HERE>/${DNS_ZONE}/g" \
         /var/lib/bind/perf.taler
 

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