[taler-grid5k] 26/141: undo removing grid5000 nameservers

[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 423c61e663960f9e0a9346fc6a2db2b21a47a64a
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Oct 7 17:06:42 2021 +0200

    undo removing grid5000 nameservers
---
 configs/etc/bind/named.conf.options | 2 +-
 experiment/scripts/database.sh      | 2 +-
 experiment/scripts/dns.sh           | 2 +-
 experiment/setup.sh                 | 6 ++++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/configs/etc/bind/named.conf.options 
b/configs/etc/bind/named.conf.options
index c3ea4a7..b3c6db8 100644
--- a/configs/etc/bind/named.conf.options
+++ b/configs/etc/bind/named.conf.options
@@ -9,7 +9,7 @@ options {
        
        //recursion yes;
 
-       rrset_order { order random; };
+       rrset-order { order random; };
 
        listen-on-v6 { any; };
 };
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index 40db66e..010dace 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -19,7 +19,7 @@ EOF
 sudo -u taler-exchange-httpd taler-exchange-dbinit
 
 su taler-exchange-httpd -s /bin/bash << EOF
-psql
+psql -d "${DB_NAME}"
 GRANT SELECT,INSERT,UPDATE ON ALL TABLES IN SCHEMA public TO "${DB_USER}";
 GRANT SELECT,INSERT,UPDATE ON ALL TABLES IN SCHEMA public TO "${DB_USER}";
 GRANT SELECT,INSERT,UPDATE ON ALL TABLES IN SCHEMA public TO "${DB_USER}";
diff --git a/experiment/scripts/dns.sh b/experiment/scripts/dns.sh
index f967fd4..191e8f0 100755
--- a/experiment/scripts/dns.sh
+++ b/experiment/scripts/dns.sh
@@ -4,6 +4,6 @@ set -eux
 sed -i "s/<DNS_KEY_HERE>/${DNS_HMAC_SHA256}/g" \
     /etc/bind/named.conf.local
 
-systemctl start named.service
+systemctl restart named.service
 
 exit 0
diff --git a/experiment/setup.sh b/experiment/setup.sh
index f4d5fb5..3ee2687 100755
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -46,8 +46,10 @@ key "ddns-key.perf.taler" {
 };
 EOF
 
-  sed -i "3i\\" 
-"nameserver ${NS_IP}" /etc/resolv.conf
+  if ! grep -Fxq "nameserver ${NS_IP}" /etc/resolv.conf ; then
+    sed -i "3i\\
+nameserver ${NS_IP}" /etc/resolv.conf
+  fi
 
   # Delete all old dns entries of the experitment
   while IFS='=' read -r name value; do

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