[taler-grid5k] 133/141: use systemd-resolved instead of dnsmasq

[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 b63e3a7551d259aeb0f54792cbc669056a013f79
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sat Nov 13 16:22:50 2021 +0100

    use systemd-resolved instead of dnsmasq
---
 .../lib/systemd/system/taler-exchange-httpd@.service |  2 +-
 experiment/scripts/exchange.sh                       |  2 ++
 experiment/setup.sh                                  | 20 ++++++++++----------
 image/taler-debian11.yaml                            |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/configs/usr/lib/systemd/system/taler-exchange-httpd@.service 
b/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
index c9d372e..d6ee28d 100755
--- a/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
@@ -9,7 +9,7 @@ PartOf=taler-exchange.target
 User=taler-exchange-httpd
 Type=simple
 Restart=on-failure
-EnvironmentFile=/etc/default/taler-exchange-httpd
+EnvironmentFile=/etc/default/taler-exchange
 ExecStart=/usr/bin/taler-exchange-httpd -c /etc/taler/taler.conf $ARGS
 StandardOutput=journal
 StandardError=journal
diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index e3b8b94..98303b2 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -28,6 +28,8 @@ then
   NUM_PROCESSES=$((${NUM_EXCHANGE_PROCESSES:-10}-1))
 
   wait_for_keys "${EXCHANGE_DOMAIN}/management"
+
+  sleep 5
   
   taler-exchange-offline download > sig-req.json
   taler-exchange-offline sign < sig-req.json > sig-res.json
diff --git a/experiment/setup.sh b/experiment/setup.sh
index 59177c7..10343a0 100644
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -35,21 +35,21 @@ key "ddns-key.perf.taler" {
 };
 EOF
 
-if ! grep -Fxq "server=/${DNS_ZONE}/${NS_IP}" /etc/dnsmasq.conf ; then
-
-  # Read grid5k DNS servers from resolv.conf and add them to dnsmasq
+if ! grep -Fq "DNS=${DNS_IP}" /etc/systemd/resolved.conf ; then
+  # Read grid5k DNS servers from resolv.conf and add them to resolved
   grep nameserver /etc/resolv.conf | \
-       awk '{print "server="$2}' \
-       >> /etc/dnsmasq.conf
-  
-  echo "server=/${DNS_ZONE}/${NS_IP}" >> /etc/dnsmasq.conf
+       awk '{print $2}' ORS=' ' | \
+       sed "s/^/DNS=${DNS_IP} /" | \
+       >> /etc/systemd/resolved.conf
 fi
 
-# Set dnsmasq to be the resolver
-echo "nameserver 127.0.0.1" > /etc/resolv.conf
+if [ ! -h /etc/resolv.conf ]; then
+  rm -f /etc/resolv.conf
+  ln -s /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
+fi
 
 systemctl daemon-reload
-systemctl restart dnsmasq 
+systemctl restart systemd-resolved
 
 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 76d2e0a..33b1701 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 dnsmasq"
+  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_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.