[taler-grid5k] 147/189: add proxy for fakebank

[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 1df7a7fcb757c774910f0b5139def7014e76dec2
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Apr 14 11:50:03 2022 +0200

    add proxy for fakebank
---
 .../etc/nginx/sites-available/{proxy => exchange}  |  2 +-
 configs/etc/nginx/sites-available/fakebank         | 26 ++++++++++++++++++++++
 configs/etc/nginx/sites-available/merchant         |  9 ++++++++
 configs/etc/taler/conf.d/fake-bank.conf            |  4 ++--
 experiment/scripts/bank.sh                         |  7 ++++--
 experiment/scripts/{proxy.sh => exchange-proxy.sh} | 10 ++++-----
 experiment/scripts/run.sh                          |  2 +-
 experiment/scripts/taler-perf.sh                   |  4 ++--
 8 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/configs/etc/nginx/sites-available/proxy 
b/configs/etc/nginx/sites-available/exchange
similarity index 92%
rename from configs/etc/nginx/sites-available/proxy
rename to configs/etc/nginx/sites-available/exchange
index a356ee8..c532895 100644
--- a/configs/etc/nginx/sites-available/proxy
+++ b/configs/etc/nginx/sites-available/exchange
@@ -34,7 +34,7 @@ server {
 
   server_name <PROXY_DOMAIN_HERE>;
 
-  access_log 
syslog:server=localhost,facility=user,tag=taler_proxy,severity=info taler 
if=$log_line;
+  access_log 
syslog:server=localhost,facility=user,tag=taler_exchange_proxy,severity=info 
taler if=$log_line;
 
   allow 172.16.0.0/12;
   deny all;
diff --git a/configs/etc/nginx/sites-available/fakebank 
b/configs/etc/nginx/sites-available/fakebank
new file mode 100644
index 0000000..36aa131
--- /dev/null
+++ b/configs/etc/nginx/sites-available/fakebank
@@ -0,0 +1,26 @@
+log_format taler 'm=$request_method uri=$uri s=$status '
+                 'uct=$upstream_connect_time '
+                 'urt=$upstream_response_time '
+                 'rt=$request_time '
+                 'rl=$request_length '
+                 'bs=$bytes_sent';
+
+server {
+  listen 80;
+  listen 443 ssl;
+
+  ssl_certificate /etc/ssl/bank.cert.pem;
+  ssl_certificate_key /etc/ssl/bank.key.pem;
+
+  server_name 0.0.0.0;
+
+  access_log 
syslog:server=localhost,facility=user,tag=taler_fakebank_proxy,severity=info 
taler;
+
+  location / {
+     proxy_pass http://unix:/var/run/taler/fakebank/fakebank.sock;
+     proxy_redirect off;
+     proxy_set_header Host $host;
+     proxy_set_header X-Forwarded-Host $remote_addr;
+     proxy_set_header X-Forwarded-Proto $scheme;
+  }
+}
diff --git a/configs/etc/nginx/sites-available/merchant 
b/configs/etc/nginx/sites-available/merchant
index 5585744..3e5a425 100644
--- a/configs/etc/nginx/sites-available/merchant
+++ b/configs/etc/nginx/sites-available/merchant
@@ -1,3 +1,10 @@
+log_format taler 'm=$request_method uri=$uri s=$status '
+                 'uct=$upstream_connect_time '
+                 'urt=$upstream_response_time '
+                 'rt=$request_time '
+                 'rl=$request_length '
+                 'bs=$bytes_sent';
+
 server {
   listen 80;
   listen 443 ssl;
@@ -7,6 +14,8 @@ server {
 
   server_name 0.0.0.0;
 
+  access_log 
syslog:server=localhost,facility=user,tag=taler_merchant_proxy,severity=info 
taler;
+
   location / {
      proxy_pass http://unix:/var/run/taler/merchant-httpd/merchant.sock;
      proxy_redirect off;
diff --git a/configs/etc/taler/conf.d/fake-bank.conf 
b/configs/etc/taler/conf.d/fake-bank.conf
index 3b8634a..1b08d69 100644
--- a/configs/etc/taler/conf.d/fake-bank.conf
+++ b/configs/etc/taler/conf.d/fake-bank.conf
@@ -1,5 +1,5 @@
 [bank]
-HTTP_PORT = 80
-SERVE = http
+SERVE = UNIX
+UNIXPATH = /var/run/taler/fakebank/fakebank.sock
 MAX_DEBT = KUDOS:100000000000.0
 MAX_DEBT_BANK = KUDOS:1000000000000000.0
diff --git a/experiment/scripts/bank.sh b/experiment/scripts/bank.sh
index feabff3..2ce81e0 100755
--- a/experiment/scripts/bank.sh
+++ b/experiment/scripts/bank.sh
@@ -13,9 +13,12 @@ source ~/scripts/helpers.sh
 
 # Start the taler-fakebank
 function init_bank() {
+  create_cert "${NODE_NAME}.${DNS_ZONE}" "/etc/ssl/bank"
   restart_rsyslog
-
-  systemctl restart taler-fakebank.service
+  mkdir -p /var/run/taler/fakebank || true
+  ln -sf /etc/nginx/sites-available/fakebank /etc/nginx/sites-enabled/fakebank
+  systemctl restart taler-fakebank.service \
+                    nginx
 }
 
 case $1 in
diff --git a/experiment/scripts/proxy.sh b/experiment/scripts/exchange-proxy.sh
similarity index 90%
rename from experiment/scripts/proxy.sh
rename to experiment/scripts/exchange-proxy.sh
index e7ab071..8e2febd 100755
--- a/experiment/scripts/proxy.sh
+++ b/experiment/scripts/exchange-proxy.sh
@@ -29,7 +29,7 @@ function add_exchanges() {
   for PORT in $(seq $START $END); do
     for HOST in ${EXCHANGES}; do
       sed -i -e "/<SERVERS_HERE>/a \ \ server ${HOST}.${DNS_ZONE}:${PORT};" \
-              /etc/nginx/sites-available/proxy
+              /etc/nginx/sites-available/exchange
     done
   done
 }
@@ -38,7 +38,7 @@ function add_exchanges() {
 function setup_config() {
 
   sed -i -e "s/<EXCHANGE_GW_DOMAIN_HERE>/${EXCHANGE_GW_DOMAIN}/g" \
-         /etc/nginx/sites-available/proxy
+         /etc/nginx/sites-available/exchange
 
   
   add_exchanges "0" ${NUM_EXCHANGE_PROCESSES}
@@ -74,11 +74,11 @@ function init_proxy() {
   setup_config
 
   # Setup the directory where Ngxinx will place its cache
-  # configured in <g5k>/configs/etc/nginx/sites-availabled/proxy
+  # configured in <g5k>/configs/etc/nginx/sites-availabled/exchange
   mkdir -p /var/cache/proxy
 
   restart_rsyslog
-  ln -sf /etc/nginx/sites-available/proxy /etc/nginx/sites-enabled/proxy
+  ln -sf /etc/nginx/sites-available/exchange /etc/nginx/sites-enabled/exchange
   
   # Nginx does not start until the destination server is reachable - wait here
   # nginx: [emerg] host not found in upstream "exch.perf.taler" ...
@@ -103,7 +103,7 @@ function remove_exchanges() {
   for PORT in $(seq $END $START); do
     for HOST in ${EXCHANGES}; do
       sed -i "/${HOST}.${DNS_ZONE}:${PORT};/d" \
-            /etc/nginx/sites-available/proxy
+            /etc/nginx/sites-available/exchange
     done
   done
 }
diff --git a/experiment/scripts/run.sh b/experiment/scripts/run.sh
index 502a71a..ca11f54 100644
--- a/experiment/scripts/run.sh
+++ b/experiment/scripts/run.sh
@@ -68,7 +68,7 @@ elif [[ "${HOSTNAME}" =~ ${EPROXY_HOSTS} ]]; then
     enable_netdelay ${PRIMARY_EXCHANGE}
     setup_log
     enable_logrotate
-    exec ~/scripts/proxy.sh init
+    exec ~/scripts/exchange-proxy.sh init
 elif [[ "${HOSTNAME}" =~ ${DNS_HOSTS} ]]; then 
     exec ~/scripts/dns.sh
 else
diff --git a/experiment/scripts/taler-perf.sh b/experiment/scripts/taler-perf.sh
index e9b81dc..2120225 100644
--- a/experiment/scripts/taler-perf.sh
+++ b/experiment/scripts/taler-perf.sh
@@ -35,7 +35,7 @@ function start_exchanges() {
   done
   for HOST in $(get_hosts "eproxy"); do
     ssh -o StrictHostKeyChecking=no ${HOST}.${DNS_ZONE} \
-           "/bin/bash /root/scripts/proxy.sh start ${RUNNING} 
${1:-${NUM_EXCHANGE_PROCESSES}}"
+           "/bin/bash /root/scripts/exchange-proxy.sh start ${RUNNING} 
${1:-${NUM_EXCHANGE_PROCESSES}}"
   done
   ssh -o StrictHostKeyChecking=no "monitor.${DNS_ZONE}" \
          "/bin/bash /root/scripts/monitor.sh start ${RUNNING} 
${1:-${NUM_EXCHANGE_PROCESSES}}"
@@ -49,7 +49,7 @@ function stop_exchanges() {
          "/bin/bash /root/scripts/monitor.sh stop-exchanges ${RUNNING} 
${1:-${NUM_EXCHANGE_PROCESSES}}"
   for HOST in $(get_hosts "eproxy"); do
     ssh -A -o StrictHostKeyChecking=no ${HOST}.${DNS_ZONE} \
-           "/bin/bash /root/scripts/proxy.sh stop ${RUNNING} 
${1:-${NUM_EXCHANGE_PROCESSES}}"
+           "/bin/bash /root/scripts/exchange-proxy.sh stop ${RUNNING} 
${1:-${NUM_EXCHANGE_PROCESSES}}"
   done
   sleep 5
   for HOST in $(get_hosts "exchange-"); do

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