[taler-grid5k] 132/141: change exchange initialisation script

[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 3b7b779273face3a55412c4d65edf7d971f040c3
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sat Nov 13 14:23:24 2021 +0100

    change exchange initialisation script
---
 configs/etc/nginx/sites-available/proxy                          | 7 ++++++-
 configs/usr/lib/systemd/system/taler-exchange-wirewatch@.service | 3 ++-
 experiment/scripts/exchange.sh                                   | 2 +-
 experiment/setup.sh                                              | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/configs/etc/nginx/sites-available/proxy 
b/configs/etc/nginx/sites-available/proxy
index 2d0aa43..4366d21 100644
--- a/configs/etc/nginx/sites-available/proxy
+++ b/configs/etc/nginx/sites-available/proxy
@@ -11,13 +11,18 @@ log_format taler 'm=$request_method uri=$request_uri 
s=$status '
                  'urt=$upstream_response_time '
                  'rt=$request_time';
 
+map $request_method $log_line {
+  'HEAD' 0;
+  default 1;
+}
+
 server {
   listen 80;
   listen [::]:80;
 
   server_name localhost;
 
-  access_log 
syslog:server=localhost,facility=user,tag=taler_proxy,severity=info taler;
+  access_log 
syslog:server=localhost,facility=user,tag=taler_proxy,severity=info taler 
if=$log_line;
 
   allow 172.16.0.0/12;
   deny all;
diff --git a/configs/usr/lib/systemd/system/taler-exchange-wirewatch@.service 
b/configs/usr/lib/systemd/system/taler-exchange-wirewatch@.service
index 88fbae1..f8ab764 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-wirewatch@.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-wirewatch@.service
@@ -7,7 +7,8 @@ PartOf=taler-exchange.target
 User=taler-exchange-wire
 Type=simple
 Restart=on-failure
-ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf -L DEBUG
+EnvironmentFile=/etc/default/taler-exchange
+ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf $ARGS
 StandardOutput=journal
 StandardError=journal
 PrivateTmp=yes
diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index 068034f..e3b8b94 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -31,7 +31,7 @@ then
   
   taler-exchange-offline download > sig-req.json
   taler-exchange-offline sign < sig-req.json > sig-res.json
-  taler-exchange-offline enable-account $(taler-config -s exchange-account-1 
-o payto_uri) > acct-res.json
+  taler-exchange-offline enable-account 
"payto://x-taler-fakebank/${BANK_DOMAIN}/Exchange" > acct-res.json
   taler-exchange-offline wire-fee 2021 x-taler-bank KUDOS:0 KUDOS:0 > 
fee-res.json
   taler-exchange-offline upload < sig-res.json
   taler-exchange-offline upload < acct-res.json
diff --git a/experiment/setup.sh b/experiment/setup.sh
index e99649f..59177c7 100644
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -7,7 +7,7 @@ source .env
 cat .env | tee -a /etc/environment
 echo "G5K_USER=$(cat experiment-info.json | jq -r '.user.name')" >> 
/etc/environment
 
-G5K_HOME=/root/grid5k
+G5K_HOME=/root/taler/grid5k
 
 NS_IP=$(host ${DNS_HOST} | sed -n 1p | awk '{print $4}')
 

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