gnunet-svn
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-grid5k] 01/73: working well unless dns

From: gnunet
Subject: [taler-grid5k] 01/73: working well unless dns
Date: Tue, 14 Dec 2021 15:09:43 +0100 
This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository grid5k.

commit f317984386a1cb711d5e8bbb2deee8ec7f83b99d
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed Nov 24 12:45:24 2021 +0100

    working well unless dns
---
 configs/etc/bind/named.conf.options         |  10 ++
 configs/etc/monitor/node-exporters.yaml.tpl |  12 +-
 configs/etc/rsyslog.d/taler.conf            |   2 +-
 configs/var/lib/bind/perf.taler             |   2 +-
 experiment/env                              |  45 +++-----
 experiment/experiment-specification.yml     |  20 +++-
 experiment/scripts/dns.sh                   |  12 --
 experiment/scripts/helpers.sh               |   2 +-
 experiment/scripts/monitor.sh               |   8 +-
 experiment/scripts/run.sh                   |  14 +--
 experiment/scripts/setup.sh                 |  48 ++++++--
 experiment/scripts/taler-perf.sh            |   4 +-
 experiment/taler.rspec                      | 170 ++++++++++++++++++++++++++++
 image/taler-debian11.yaml                   |   2 +-
 notes.txt                                   |   4 +-
 15 files changed, 274 insertions(+), 81 deletions(-)

diff --git a/configs/etc/bind/named.conf.options 
b/configs/etc/bind/named.conf.options
index cae6567..f72f33b 100644
--- a/configs/etc/bind/named.conf.options
+++ b/configs/etc/bind/named.conf.options
@@ -21,3 +21,13 @@ options {
   };
 };
 
+logging {
+  channel default_file {
+    file "/var/log/named.log" size 100m;
+    severity info;
+    print-time yes;
+    print-severity yes;
+    print-category yes;
+  };
+  category default{ default_file; };
+};
diff --git a/configs/etc/monitor/node-exporters.yaml.tpl 
b/configs/etc/monitor/node-exporters.yaml.tpl
index 09cbcaa..3aa3bc2 100644
--- a/configs/etc/monitor/node-exporters.yaml.tpl
+++ b/configs/etc/monitor/node-exporters.yaml.tpl
@@ -3,19 +3,19 @@
     - labels:
         component: 'database'
       targets: 
-      - 'db.perf.taler:9100'
+      - '${DATABASE_DOMAIN}:9100'
     - labels:
         component: 'bank'
       targets:
-      - 'bank.perf.taler:9100'
+      - '${BANK_DOMAIN}:9100'
     - labels:
         component: 'exchange'
       targets:
-      - 'exch.perf.taler:9100'
+      - '${EXCHANGE_DOMAIN}:9100'
     - labels:
         component: 'proxy'
       targets:
-      - 'proxy.perf.taler:9100'
+      - '${PROXY_DOMAIN}:9100'
     - labels:
         component: 'wallet'
       targets:
@@ -23,8 +23,8 @@
     - labels:
         component: 'monitor'
       targets:
-      - 'monitor.perf.taler:9100'
+      - '${MONITOR_DOMAIN}:9100'
     - labels:
         component: 'merchant'
       targets:
-      - 'merch.perf.taler:9100'
+      - '${MERCHANT_DOMAIN}:9100'
diff --git a/configs/etc/rsyslog.d/taler.conf b/configs/etc/rsyslog.d/taler.conf
index cbc8e7a..848afe4 100644
--- a/configs/etc/rsyslog.d/taler.conf
+++ b/configs/etc/rsyslog.d/taler.conf
@@ -10,7 +10,7 @@ if ($programname startswith 'taler' or $syslogtag startswith 
'taler') then {
 # 
https://grafana.com/docs/loki/latest/clients/promtail/scraping/#rsyslog-output-configuration
   action(type="omfwd"
          protocol="tcp"
-         target="monitor.perf.taler"
+         target="<MONITOR_DOMAIN_HERE>"
          port="1514"
          Template="RSYSLOG_SyslogProtocol23Format"
          TCP_Framing="octet-counted"
diff --git a/configs/var/lib/bind/perf.taler b/configs/var/lib/bind/perf.taler
index 81ea22d..afa5ad3 100644
--- a/configs/var/lib/bind/perf.taler
+++ b/configs/var/lib/bind/perf.taler
@@ -9,4 +9,4 @@ $TTL 3600       ; 1 hour
                                )
                        NS      ns1.<DNS_ZONE_HERE>.
 $ORIGIN <DNS_ZONE_HERE>.
-ns1                    A       127.0.0.1
+ns1                    A       <NS_IP_HERE>
diff --git a/experiment/env b/experiment/env
index f08ffdc..cfc44c9 100644
--- a/experiment/env
+++ b/experiment/env
@@ -1,34 +1,21 @@
-# Place hosts which are allocated by jFed here
-# They can be found in the tab 'RSpec Viewer' once the 
-# nodes are allocated.
-# Once the allocation bug is fixed these configurations
-# will be removed.
-# The DNS_HOST must be set completely, others can contain
-# a wildcard after the node name to match the site automatically.
-# Wallet hosts can be specified as a wildcard only since
-# all other hosts are matched before.
-    BANK_HOSTS=dahu-x.*
-DATABASE_HOSTS=dahu-y.*
-      DNS_HOST=dahu-12.grenoble.grid5000.fr
-EXCHANGE_HOSTS=dahu-z.*
-MERCHANT_HOSTS=grvingt-x.*
- MONITOR_HOSTS=econome-y.*
-   PROXY_HOSTS=dahu-u.*
-  WALLET_HOSTS=*
+# Important node names, DO NOT Adjust unless you know
+# what you are doing, it most certain needs adjustings 
+# in run.sh and other scripts.
+NODES="Bank DB DNS Exchange Merchant Monitor Proxy"
 
 DNS_ZONE=perf.taler
-
-# These values specify the domain names for
-# the nodes, they most certain do not need to be adjusted.
-# DO NOT change wallet domain, since this is currently needed
-# for cleardns.sh
-    BANK_DOMAIN=bank.perf.taler
-DATABASE_DOMAIN=db.perf.taler
-EXCHANGE_DOMAIN=exch.perf.taler
-MERCHANT_DOMAIN=merch.perf.taler
- MONITOR_DOMAIN=monitor.perf.taler
-   PROXY_DOMAIN=proxy.perf.taler
-  WALLET_DOMAIN=wallet.*.perf.taler
+G5K_HOME=/root/taler/grid5k
+
+# Domain names for the hosts inside the grid.
+# They most certainly do not need to be adjusted.
+    BANK_DOMAIN=bank.${DNS_ZONE}
+DATABASE_DOMAIN=db.${DNS_ZONE}
+     DNS_DOMAIN=ns1.${DNS_ZONE}
+EXCHANGE_DOMAIN=exchange.${DNS_ZONE}
+MERCHANT_DOMAIN=merchant.${DNS_ZONE}
+ MONITOR_DOMAIN=monitor.${DNS_ZONE}
+   PROXY_DOMAIN=proxy.${DNS_ZONE}
+  WALLET_DOMAIN=wallet.*.${DNS_ZONE}
 
 # Arguments to pass to taler-exchange-* binaries at startup.
 EXCHANGE_ARGS="-L INFO"
diff --git a/experiment/experiment-specification.yml 
b/experiment/experiment-specification.yml
index 6881aea..4465e9b 100644
--- a/experiment/experiment-specification.yml
+++ b/experiment/experiment-specification.yml
@@ -1,18 +1,28 @@
 version: 1.0-basic
 rspec: 
-  - bundled: infra.rspec
+  - bundled: taler.rspec
 upload: 
   - bundled: .env
     permission: "664"
-  - bundled: scripts
-    path: ~/scripts
+    path: /tmp/.env
+  - bundled: scripts/
+    path: /tmp/scripts/
     permission: "775"
   # Contains information about allocated nodes
   - meta: experiment-info.json
 execute:
+  # Clear previous uploads and move new ones to ~/
+  # This step is necessary since dir uploads are not overriden
+  # which results in an error otherwise
+  - direct: |
+      #!/bin/bash
+      rm -rf /root/{scripts,.env,nodes.json} || true
+      mv /tmp/{scripts,.env} ~/
+      rm -rf ~/'execute[0].sh'
+      # Reset possible DNS issues created by our scripts
+      mv /etc/resolv.conf.bak /etc/resolv.conf || true
+    log: /dev/null
   # Setup DNS and Environment config
   - path: ~/scripts/setup.sh
-  - path: ~/scripts/dns.sh
-    nodes: [DNS]
   # Execute node specific code
   - path: ~/scripts/run.sh
diff --git a/experiment/scripts/dns.sh b/experiment/scripts/dns.sh
deleted file mode 100644
index 06c01ff..0000000
--- a/experiment/scripts/dns.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -eux
-
-# Stop dnsmasq just to be save
-systemctl stop dnsmasq
-systemctl restart named
-
-# Make sure the dns is ready
-sleep 5
-
-exit 0
-
diff --git a/experiment/scripts/helpers.sh b/experiment/scripts/helpers.sh
index 9cc0351..b6852c9 100755
--- a/experiment/scripts/helpers.sh
+++ b/experiment/scripts/helpers.sh
@@ -39,7 +39,7 @@ function restart_rsyslog() {
 
 function get_wallet_domains() {
   IFS=$'\n' read -r -d '' -a WALLETS < <(\
-    dig -t AXFR "${DNS_ZONE}" "@${DNS_HOST}" \
+    dig -t AXFR "${DNS_ZONE}" "@${DNS_HOSTS}" \
     | grep wallet | awk '{print $1}' | cut -d '.' -f 2 \
   )
   echo ${WALLETS[@]}
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index f003a32..c861bce 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -50,10 +50,10 @@ then
   # Initialize prometheus after the db is ready, then all dns records have 
been set for sure
   if [[ "${ENABLE_EXPORTERS}" == "true" ]];
   then
-    cat /etc/monitor/node-exporters.yaml.tpl >> /etc/monitor/prometheus.yaml
+    cat /etc/monitor/node-exporters.yaml.tpl | envsubst >> 
/etc/monitor/prometheus.yaml
     for WALLET in $(get_wallet_domains);
     do
-      sed -i "/<WALLETS_HERE>/a \ \ \ \ \ \ - 
'wallet.${WALLET}.perf.taler:9100'" \
+      sed -i "/<WALLETS_HERE>/a \ \ \ \ \ \ - 
'wallet.${WALLET}.${DNS_ZONE}:9100'" \
            /etc/monitor/prometheus.yaml
     done
   fi
@@ -69,9 +69,9 @@ else
   then
     for WALLET in $(get_wallet_domains);
     do
-      if ! grep -q "wallet.${WALLET}.perf.taler:9100" 
/etc/monitor/prometheus.yaml; 
+      if ! grep -q "wallet.${WALLET}.${DNS_ZONE}:9100" 
/etc/monitor/prometheus.yaml; 
       then
-        sed -i "/<WALLETS_HERE>/a \ \ \ \ \ \ - 
'wallet.${WALLET}.perf.taler:9100'" \
+        sed -i "/<WALLETS_HERE>/a \ \ \ \ \ \ - 
'wallet.${WALLET}.${DNS_ZONE}:9100'" \
                 /etc/monitor/prometheus.yaml
       fi
     done
diff --git a/experiment/scripts/run.sh b/experiment/scripts/run.sh
index 2f08fb6..03fc816 100644
--- a/experiment/scripts/run.sh
+++ b/experiment/scripts/run.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 # Run the experitment
-set -euax
-
-# They start the scripts with /bin/bash -c
 source ~/.env
 
+set -euax
+
 # Set a dynamic domain name in our own dns
 # argument: the domain to be added
 function set_ddn() {
   nsupdate -v << EOF
-server ${DNS_HOST}
+server ${DNS_HOSTS}
 zone ${DNS_ZONE}
 update add $1 3600 A $(hostname -I)
 send
@@ -45,7 +44,7 @@ case "${HOSTNAME}" in
     enable_logbackup
     exec ~/scripts/bank.sh
     ;;
-  ${DATABASE_HOSTS}) 
+  ${DB_HOSTS}) 
     set_host database
     set_ddn ${DATABASE_DOMAIN}
     exec ~/scripts/database.sh init
@@ -74,11 +73,12 @@ case "${HOSTNAME}" in
     enable_logbackup
     exec ~/scripts/proxy.sh init
     ;;
-  ${DNS_HOST})
+  ${DNS_HOSTS})
     ;;
   ${WALLET_HOSTS}) 
     set_host wallet
-    set_ddn "wallet.$(hostname | cut -d '.' -f1).${DNS_ZONE}"
+    HOST=$(hostname | cut -d '.' -f1)
+    set_ddn "${WALLET_DOMAIN//\*/${HOST}}"
     enable_netdelay ${PROXY_DOMAIN}
     exec ~/scripts/wallet.sh init
     ;;
diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index 1021cb8..8b17e32 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -1,19 +1,28 @@
 #!/bin/bash
 # Setup nodes for the experiment
-set -eua
 
+# Set the current user
 echo "G5K_USER=$(cat ~/experiment-info.json | jq -r '.user.name')" >> ~/.env
 
 source ~/.env
-# Add the environment config for following shells
-cat ~/.env | grep -v API_KEY | tee -a /etc/environment
 
-set -x
+set -euax
 
-if [[ "${DNS_HOST}" != *-*.*.grid5000.fr ]]; then
-  echo "DNS_HOST must be set completely!"
+if [ ! -f ~/nodes.json ]; then
+  cat ~/experiment-info.json | \
+       jq '.nodes | to_entries | .[] | {node: .key, host: 
.value.ssh_login[1].hostname }' | \
+       jq -s \
+       > ~/nodes.json
 fi
 
+for NODE in ${NODES}; do
+ echo "${NODE^^}_HOSTS=\"$(cat ~/nodes.json | \
+       jq --arg NODE ${NODE}.* -r 'map(select(.node | test($NODE)) | .host) | 
join("|")')\"" \
+       >> ~/.env
+done
+
+echo "WALLET_HOSTS=*" >> ~/.env
+
 LOG_DIR=/home/${G5K_USER}/taler-logs
 
 if [ -d ${LOG_DIR} ]; then
@@ -24,9 +33,23 @@ else
   LOG_DIR=/tmp/taler && mkdir ${LOG_DIR}
 fi
 
-G5K_HOME=/root/taler/grid5k
+echo "LOG_DIR=${LOG_DIR}" >> ~/.env
 
-NS_IP=$(host ${DNS_HOST} | sed -n 1p | awk '{print $4}')
+set +x
+
+# Needed for envsubst to work 
+export DNS_ZONE=${DNS_ZONE}
+# Set the hostnames completely with substituting ${DNS_ZONE}
+cat ~/.env | envsubst > .env && mv .env ~/.env
+# Add the environment config for following shells
+cat ~/.env | grep -v API_KEY | tee /etc/environment
+
+# Reload the env since HOST_* and *_DOMAIN was added
+source ~/.env
+
+set -x
+
+NS_IP=$(host ${DNS_HOSTS} | sed -n 1p | awk '{print $4}')
 
 # Temporarily checkout to the feature branch
 cd "${G5K_HOME}" && git checkout node-setup && git pull && cd
@@ -62,15 +85,20 @@ sed -i "s/<DNS_ZONE_HERE>/${DNS_ZONE}/g" \
         /etc/bind/named.conf.local
 sed -i "s/<GRID_DNS_HERE>/${BIND_SERVERS}/g" \
         /etc/bind/named.conf.options
-sed -i "s/<DNS_ZONE_HERE>/${DNS_ZONE}/g" \
+sed -i -e "s/<DNS_ZONE_HERE>/${DNS_ZONE}/g" \
+       -e "s/<NS_IP_HERE>/${NS_IP}/g" \
         /var/lib/bind/perf.taler
 
 systemctl daemon-reload
 
-if [[ "${HOSTNAME}" != "${DNS_HOST}" ]]; then
+if ! [[ "${HOSTNAME}" =~ ${DNS_HOSTS} ]]; then
   systemctl restart dnsmasq
+else 
+  systemctl restart named
 fi
 
+sleep 5
+
 if [ -f ~/scripts/taler-perf.sh ]; then
   mv ~/scripts/taler-perf.sh /usr/local/bin/taler-perf
 fi
diff --git a/experiment/scripts/taler-perf.sh b/experiment/scripts/taler-perf.sh
index 9a39540..8aeb6d1 100644
--- a/experiment/scripts/taler-perf.sh
+++ b/experiment/scripts/taler-perf.sh
@@ -6,7 +6,7 @@ source ~/scripts/helpers.sh
 
 function start_wallets() {
   for WALLET in $(get_wallet_domains); do
-    ssh -o StrictHostKeyChecking=no wallet.${WALLET}.perf.taler \
+    ssh -o StrictHostKeyChecking=no wallet.${WALLET}.${DNS_ZONE} \
            "/bin/bash /root/scripts/wallet.sh start 
${1:-${NUM_WALLET_PROCESSES}}" &
   done
   wait
@@ -14,7 +14,7 @@ function start_wallets() {
 
 function stop_wallets() {
  for WALLET in $(get_wallet_domains); do
-   ssh -o StrictHostKeyChecking=no wallet.${WALLET}.perf.taler \
+   ssh -o StrictHostKeyChecking=no wallet.${WALLET}.${DNS_ZONE} \
           "/bin/bash /root/scripts/wallet.sh stop 
${1:-${NUM_WALLET_PROCESSES}}" &
   done
   wait
diff --git a/experiment/taler.rspec b/experiment/taler.rspec
new file mode 100644
index 0000000..9c45415
--- /dev/null
+++ b/experiment/taler.rspec
@@ -0,0 +1,170 @@
+<?xml version='1.0'?>
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-11-23T19:13:57.338+01:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
+  <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="grvingt-nancy"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="156.0" 
y="70.0"/>
+  </node>
+  <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="grvingt-nancy"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="283.0" 
y="127.5"/>
+  </node>
+  <node client_id="Bank" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="grvingt-nancy"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="422.0" 
y="70.0"/>
+  </node>
+  <node client_id="Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="grvingt-nancy"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="284.5" 
y="184.5"/>
+  </node>
+  <node client_id="Monitor" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="732.5" 
y="156.5"/>
+  </node>
+  <node client_id="Merchant" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="554.5" 
y="156.5"/>
+  </node>
+  <node client_id="DNS" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="grvingt-nancy"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="638.0" 
y="70.0"/>
+  </node>
+  <node client_id="Wallet-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="140.0" 
y="300.0"/>
+  </node>
+  <node client_id="Wallet-2" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="280.0" 
y="300.0"/>
+  </node>
+  <node client_id="Wallet-3" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="440.0" 
y="300.0"/>
+  </node>
+  <node client_id="Wallet-4" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="580.0" 
y="300.0"/>
+  </node>
+  <node client_id="Wallet-5" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="740.0" 
y="300.0"/>
+  </node>
+  <node client_id="Wallet-6" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="140.0" 
y="340.0"/>
+  </node>
+  <node client_id="Wallet-7" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="280.0" 
y="340.0"/>
+  </node>
+  <node client_id="Wallet-8" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="440.0" 
y="340.0"/>
+  </node>
+  <node client_id="Wallet-9" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="580.0" 
y="340.0"/>
+  </node>
+  <node client_id="Wallet-10" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="740.0" 
y="340.0"/>
+  </node>
+  <node client_id="Wallet-11" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="140.0" 
y="380.0"/>
+  </node>
+  <node client_id="Wallet-12" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="280.0" 
y="380.0"/>
+  </node>
+  <node client_id="Wallet-13" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="440.0" 
y="380.0"/>
+  </node>
+  <node client_id="Wallet-14" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="580.0" 
y="380.0"/>
+  </node>
+  <node client_id="Wallet-15" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="740.0" 
y="380.0"/>
+  </node>
+  <node client_id="Wallet-16" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="140.0" 
y="420.0"/>
+  </node>
+  <node client_id="Wallet-17" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="280.0" 
y="420.0"/>
+  </node>
+  <node client_id="Wallet-18" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="440.0" 
y="420.0"/>
+  </node>
+  <node client_id="Wallet-19" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="580.0" 
y="420.0"/>
+  </node>
+  <node client_id="Wallet-20" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="740.0" 
y="420.0"/>
+  </node>
+</rspec>
\ No newline at end of file
diff --git a/image/taler-debian11.yaml b/image/taler-debian11.yaml
index dec6fb8..df7054c 100644
--- a/image/taler-debian11.yaml
+++ b/image/taler-debian11.yaml
@@ -42,7 +42,7 @@ global:
   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_no_recommends: "prometheus prometheus-node-exporter"
-  taler_disable_services: "nginx postgresql prometheus 
prometheus-postgres-exporter prometheus-nginx-exporter prometheus-node-exporter 
named"
+  taler_disable_services: "nginx postgresql prometheus 
prometheus-postgres-exporter prometheus-nginx-exporter prometheus-node-exporter 
named gettext-base"
   taler_loki_version: "v2.4.0"
   gnunet_tar: gnunet.tar.gz
   exchange_tar: exchange.tar.gz
diff --git a/notes.txt b/notes.txt
index d98530f..1165b70 100644
--- a/notes.txt
+++ b/notes.txt
@@ -18,8 +18,8 @@
     The proxy server could not handle the request<p>Reason: <strong>Error 
reading from remote server</strong></p></p>
 * SSH login from rpesc viewer not possible
 * SSH login often fails - must provide password for cert and user (user 
password is not the one I speciefied, neither the default for the root user of 
the image) - or connection closed ... - BUG in allocation code according to 
email
-* espec documentation incomplete and contains unknown key, exaple: 
execute.local dir.sudo
+* espec documentation incomplete and contains unknown key, exaple: 
execute.local dir.sudo .config
 * espec dir creation does not work - hangs at Dir "null" Creations at ...
-* espec - possibility to rerun and override previously uploaded files 
(directory type)
+* espec - possibility to rerun and override previously uploaded files 
(directory type) or at leat a pre-upload execute step to clean manually
 * espec - states 'permissions' as keyword where it is really 'permission' only
 * ansible not working with debian 11 - install script fails - but even when 
installed manually it hangs in preparing ansible dir

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
reply via email to
[Prev in Thread] Current Thread [Next in Thread]