[taler-grid5k] 48/141: fix script imports, add net packages

[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 9d4522fa282b82ebdf2fd672a896bdfbe180b0ec
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Oct 14 22:57:36 2021 +0200

    fix script imports, add net packages
---
 experiment/scripts/exchange.sh | 3 ---
 experiment/scripts/monitor.sh  | 2 +-
 experiment/scripts/proxy.sh    | 2 ++
 image/taler-debian11.yaml      | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index 1fb6ae0..4a7d6b6 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -3,9 +3,6 @@ set -eux
 
 source ~/scripts/helpers.sh
 
-# remove later
-apt install -y net-tools netcat
-
 restart_rsyslog
 
 sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@${DATABASE_DOMAIN}/${DB_NAME}\g"
 \
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index 54a29e4..cc63fad 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eux
 
-source ~/scripts/helper.sh
+source ~/scripts/helpers.sh
 
 AUTH_HEADER="Authorization: Bearer ${GRAFANA_API_KEY}"
 GRAFANA_API="https://$(host ${DNS_HOST} | sed -n 1p | awk '{print 
$4}'):3000/api"
diff --git a/experiment/scripts/proxy.sh b/experiment/scripts/proxy.sh
index 7254aa4..0727269 100755
--- a/experiment/scripts/proxy.sh
+++ b/experiment/scripts/proxy.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -eux
 
+source ~/scripts/helpers.sh
+
 sed $"/<SERVERS_HERE>/a \ \ server ${EXCHANGE_DOMAIN}:80;" \
     /etc/nginx/sites-available/proxy > /etc/nginx/sites-enabled/proxy
 
diff --git a/image/taler-debian11.yaml b/image/taler-debian11.yaml
index 534464c..0c33286 100644
--- a/image/taler-debian11.yaml
+++ b/image/taler-debian11.yaml
@@ -38,7 +38,7 @@ global:
   # g5k_kernel_params: ""
   ## Environment visibility
   # g5k_visibility: "shared"
-  taler_packages: "nginx postgresql-13 postgresql-contrib curl jq 
taler-exchange taler-auditor taler-merchant taler-exchange-offline 
taler-wallet-cli sudo git zile dnsutils libtalerexchange-dev 
prometheus-postgres-exporter prometheus-nginx-exporter"
+  taler_packages: "nginx postgresql-13 postgresql-contrib curl jq 
taler-exchange taler-auditor taler-merchant taler-exchange-offline 
taler-wallet-cli sudo git zile dnsutils libtalerexchange-dev 
prometheus-postgres-exporter prometheus-nginx-exporter net-tools netcat"
   taler_packages_no_recommends: "prometheus"
   other_packages_no_clean: "$${taler_packages} 
$${taler_packages_no_recommends}" 
   taler_disable_services: "nginx postgresql prometheus 
prometheus-postgres-exporter prometheus-nginx-exporter"

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