[taler-grid5k] 134/141: resolved does not work, switch back

[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 67104d444369968736a4947db15ed37f1b1ad41d
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sat Nov 13 20:17:24 2021 +0100

    resolved does not work, switch back
---
 experiment/setup.sh       | 18 +++++++++---------
 image/taler-debian11.yaml |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/experiment/setup.sh b/experiment/setup.sh
index 10343a0..fc378eb 100644
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -35,21 +35,21 @@ key "ddns-key.perf.taler" {
 };
 EOF
 
-if ! grep -Fq "DNS=${DNS_IP}" /etc/systemd/resolved.conf ; then
-  # Read grid5k DNS servers from resolv.conf and add them to resolved
+if ! grep -Fxq "server=/${DNS_ZONE}/${NS_IP}" /etc/dnsmasq.conf ; then
+  echo "server=/${DNS_ZONE}/${NS_IP}" >> /etc/dnsmasq.conf 
+  # Read grid5k DNS servers from resolv.conf and add them to dnsmasq
   grep nameserver /etc/resolv.conf | \
-       awk '{print $2}' ORS=' ' | \
-       sed "s/^/DNS=${DNS_IP} /" | \
-       >> /etc/systemd/resolved.conf
+    awk '{print "server=/grid5000.fr/"$2}' \
+    >> /etc/dnsmasq.conf
 fi
 
-if [ ! -h /etc/resolv.conf ]; then
-  rm -f /etc/resolv.conf
-  ln -s /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
+if ! grep -Fxq "nameserver 127.0.0.1" /etc/resolv.conf ; then
+  mv /etc/resolv.conf /etc/resolv.conf.bak
+  echo "nameserver 127.0.0.1" > /etc/resolv.conf
 fi
 
 systemctl daemon-reload
-systemctl restart systemd-resolved
+systemctl restart dnsmasq
 
 if [ -f ~/taler-perf.sh ]; then
   mv ~/taler-perf.sh /usr/local/bin/taler-perf
diff --git a/image/taler-debian11.yaml b/image/taler-debian11.yaml
index 33b1701..76d2e0a 100644
--- a/image/taler-debian11.yaml
+++ b/image/taler-debian11.yaml
@@ -40,7 +40,7 @@ global:
   ## Environment visibility
   # g5k_visibility: "shared"
   taler_build_packages: "recutils autoconf uncrustify autopoint libtool 
python3-pip libgcrypt20-dev libjansson-dev libcurl4-gnutls-dev libsodium-dev 
libidn2-dev libunistring-dev libmicrohttpd-dev libsqlite3-dev libqrencode-dev 
valgrind libpq-dev texinfo gdb make npm zip python3-distutils pkg-config"
-  taler_packages: "nginx postgresql-13 postgresql-contrib curl jq bc sudo git 
zile dnsutils prometheus-postgres-exporter prometheus-nginx-exporter net-tools 
netcat parallel nodejs tshark"
+  taler_packages: "nginx postgresql-13 postgresql-contrib curl jq bc sudo git 
zile dnsutils prometheus-postgres-exporter prometheus-nginx-exporter net-tools 
netcat parallel nodejs tshark dnsmasq"
   taler_packages_no_recommends: "prometheus prometheus-node-exporter"
   taler_disable_services: "nginx postgresql prometheus 
prometheus-postgres-exporter prometheus-nginx-exporter prometheus-node-exporter"
   taler_loki_version: "v2.4.0"

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