[taler-grid5k] 10/48: fix merchant

[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 80a42735e83d642f79e45a62b0a929463a6ba482
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed May 11 19:15:59 2022 +0200

    fix merchant
---
 configs/etc/nginx/sites-available/merchant |  1 +
 experiment/env                             |  3 ++-
 experiment/scripts/database.sh             | 10 ++++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/configs/etc/nginx/sites-available/merchant 
b/configs/etc/nginx/sites-available/merchant
index 655cbb7..e51f6b0 100644
--- a/configs/etc/nginx/sites-available/merchant
+++ b/configs/etc/nginx/sites-available/merchant
@@ -15,6 +15,7 @@ server {
   server_name 0.0.0.0;
 
   allow 172.16.0.0/12;
+  allow 127.0.0.1/32;
   deny all;
 
   access_log 
syslog:server=localhost,facility=user,tag=taler_merchant_proxy,severity=info 
taler;
diff --git a/experiment/env b/experiment/env
index ff283e6..1a7f42e 100644
--- a/experiment/env
+++ b/experiment/env
@@ -28,7 +28,7 @@ EXCHANGE_GW_DOMAIN=exchange.${DNS_ZONE}
 
 # Arguments to pass to all taler-exchange-* binaries at startup.
 # E.g. -L INFO
-     TALER_ARGS="-L INFO"
+     TALER_ARGS="-L ERROR"
 # Service specific arguments to pass at startup
 AGGREGATOR_ARGS="-y"
       BANK_ARGS=""
@@ -127,6 +127,7 @@ NUM_EXCHANGE_PROCESSES=1
 # Number of other exchange-* processes to run
 # This setting is static, default = 1
 # For the aggregator the number will be actually 2^n (so 0 will be 1 process)
+# If you want no aggregator just set it to -1
 NUM_AGGREGATOR_PROCESSES=0
     NUM_CLOSER_PROCESSES=1
    NUM_TRANSER_PROCESSES=1
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index 9851b54..3168a76 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -63,6 +63,9 @@ function setup_config() {
          -e "s/<SHARD_USER_HERE>/${DB_USER}/g" \
         -e "s/<SHARD_USER_PW_HERE>/${DB_PASSWORD}/g" \
        /etc/taler/secrets/exchange-db.secret.conf
+
+  sed -i -e "s|<SHARD_DOMAIN_HERE>|${DNS_ZONE}|g" \
+         /etc/taler/conf.d/exchange-business.conf
   
   # Get hardware info to tune in postgresql.conf
   SHARED_MEM=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo) / 4 ))
@@ -270,10 +273,9 @@ psql -d "${DB_NAME}" -tAc "CREATE USER MAPPING IF NOT 
EXISTS FOR \"${DB_USER}\"
                            SERVER \"${i}\"
                            OPTIONS (user '${DB_USER}', password 
'${DB_PASSWORD}');"
 EOF
-# Only in pg 14
-# for in $(seq $NUM_SHARDS); do
-#   psql -d "${DB_NAME}" -tAc "ALTER SERVER ${i} OPTIONS (async_capable 
"true");
-# done
+    if [[ ${POSTGRES_VERSION} == 14 ]]; then
+      psql -d "${DB_NAME}" -tAc "ALTER SERVER ${i} OPTIONS (async_capable 
'true');"
+    fi
   done
 
 }

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