[taler-grid5k] 04/73: run 'createuser' in image build - try to fix dmsasq issue

[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 ab673937d6d83470e6f4a88650c9b97e88b146ad
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed Nov 24 16:22:52 2021 +0100

    run 'createuser' in image build - try to fix dmsasq issue
---
 experiment/scripts/setup.sh | 8 ++------
 image/taler-debian11.yaml   | 4 +++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index dcbc083..7129ef3 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -92,19 +92,15 @@ sed -i -e "s/<DNS_ZONE_HERE>/${DNS_ZONE}/g" \
 systemctl daemon-reload
 
 if ! [[ "${HOSTNAME}" =~ ${DNS_HOSTS} ]]; then
+  # Wait for named to be ready before starting dnsmasq
+  sleep 5
   systemctl restart dnsmasq
 else 
-  systemctl stop dnsmasq
-  sleep 1
   systemctl restart named
 fi
 
-sleep 5
-
 if [ -f ~/scripts/taler-perf.sh ]; then
   mv ~/scripts/taler-perf.sh /usr/local/bin/taler-perf
 fi
 
-exec ~/scripts/createusers.sh
-
 exit 0
diff --git a/image/taler-debian11.yaml b/image/taler-debian11.yaml
index febb4bb..7a9f4c6 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 bind9"
+  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 bind9 systemd-coredump"
   taler_packages_no_recommends: "prometheus prometheus-node-exporter"
   taler_disable_services: "nginx postgresql prometheus 
prometheus-postgres-exporter prometheus-nginx-exporter prometheus-node-exporter 
named gettext-base dnsmasq"
   taler_loki_version: "v2.4.0"
@@ -152,6 +152,8 @@ setup:
 
          git clone git://git.taler.net/grid5k.git 
 
+         ./grid5k/experiment/scripts/createusers.sh
+
     - loki-promtail:
       - exec_in: |
          apt-get install -y unzip curl

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