[taler-grid5k] 95/189: fix

[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 e3ed1c16484d44a076ce0d57134ad3f2b512c6ae
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Fri Mar 18 22:55:57 2022 +0100

    fix
---
 configs/etc/nginx/sites-available/merchant | 4 ++--
 configs/etc/taler/conf.d/merchant.conf     | 2 +-
 experiment/scripts/merchant.sh             | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configs/etc/nginx/sites-available/merchant 
b/configs/etc/nginx/sites-available/merchant
index 7813692..2f785a9 100644
--- a/configs/etc/nginx/sites-available/merchant
+++ b/configs/etc/nginx/sites-available/merchant
@@ -5,10 +5,10 @@ server {
   ssl_certificate /etc/ssl/merchant.cert.pem;
   ssl_certificate_key /etc/ssl/merchant.key.pem;
 
-  servername 0.0.0.0;
+  server_name 0.0.0.0;
 
   location / {
-     proxy_pass http://unix:/var/lib/taler/merchant.sock;
+     proxy_pass http://unix:/var/run/taler/mercahnt-httpd/merchant.sock;
      proxy_redirect off;
      proxy_set_header Host $host;
      proxy_set_header X-Forwarded-Host $remote_addr;
diff --git a/configs/etc/taler/conf.d/merchant.conf 
b/configs/etc/taler/conf.d/merchant.conf
index 8fca35e..6d58c2d 100644
--- a/configs/etc/taler/conf.d/merchant.conf
+++ b/configs/etc/taler/conf.d/merchant.conf
@@ -4,7 +4,7 @@
 
 DATABASE = postgres
 SERVE = UNIX
-UNIXPATH = /var/lib/taler/merchant.sock
+UNIXPATH = /var/run/taler/merchant-httpd/merchant.sock
 
 [taler]
 
diff --git a/experiment/scripts/merchant.sh b/experiment/scripts/merchant.sh
index ef2d019..a2e5ab2 100755
--- a/experiment/scripts/merchant.sh
+++ b/experiment/scripts/merchant.sh
@@ -80,7 +80,7 @@ function create_instance() {
             \"default_wire_transfer_delay\": {\"d_ms\": 1209600000},
             \"default_pay_delay\": {\"d_ms\": 1209600000}
           }" \
-        http://localhost:8080/management/instances
+        http://localhost/management/instances
 }
 
 # Initialize the merchant
@@ -94,6 +94,7 @@ function init_merchant() {
   ln -sf /etc/nginx/sites-available/merchant /etc/nginx/sites-enabled/merchant
   systemctl restart taler-merchant-httpd \
                     nginx
+  sleep 5
   create_instance "default"
   create_instance ${NODE_NAME}
 }

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