[taler-grid5k] 102/141: update merchant configuration

[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 d7ad99fe2505e524e3b45e78e84fcf247e0cb89d
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Nov 4 15:38:46 2021 +0100

    update merchant configuration
---
 configs/etc/monitor/prometheus.yaml |  2 +-
 experiment/scripts/database.sh      |  2 +-
 experiment/scripts/merchant.sh      | 20 +++++++++++++++++---
 experiment/scripts/monitor.sh       |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/configs/etc/monitor/prometheus.yaml 
b/configs/etc/monitor/prometheus.yaml
index 706eff7..88e61fd 100644
--- a/configs/etc/monitor/prometheus.yaml
+++ b/configs/etc/monitor/prometheus.yaml
@@ -14,7 +14,7 @@ scrape_configs:
   # DB Exporter
   - job_name: 'database'
     static_configs:
-    - targets: ['127.0.0.1:9187']
+    - targets: ['127.0.0.1:9187', '<MERCHANT_HOST_HERE>:9187']
 
   # Exchange Proxy Exporter 
   - job_name: 'exchange-proxy'
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index da0fb17..da9437d 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -14,7 +14,7 @@ listen_addresses='*'
 log_destination=syslog
 syslog_ident='taler-database'
 log_min_duration_statement=500
-shared_preload_libraries='pg_stat_statements,auto_explain'
+hared_preload_libraries='pg_stat_statements,auto_explain'
 " >> /etc/postgresql/13/main/postgresql.conf
 
 # Enable password for taler since this is commonly the case
diff --git a/experiment/scripts/merchant.sh b/experiment/scripts/merchant.sh
index eb04279..f280f70 100755
--- a/experiment/scripts/merchant.sh
+++ b/experiment/scripts/merchant.sh
@@ -3,6 +3,8 @@ set -eux
 
 source ~/scripts/helpers.sh
 
+cd /tmp
+
 restart_rsyslog
 
 wait_for_keys "${PROXY_DOMAIN}"
@@ -14,10 +16,18 @@ MASTER_KEY=$(
 )
 
 sed -i -e "s\<EXCHANGE_URL_HERE>\http://${EXCHANGE_DOMAIN}/\g"; \
-       -e "s/<EXCHANGE_MASTER_KEY_HERE>/${MASTER_KEY}/g"
+       -e "s/<EXCHANGE_MASTER_KEY_HERE>/${MASTER_KEY}/g" \
         /etc/taler/conf.d/merchant.conf
 
-systemctl restart postgres
+echo "
+local all all trust
+" >> /etc/postgresql/13/main/pg_hba.conf
+
+echo "
+shared_preload_libraries='pg_stat_statements,auto_explain'
+" >> /etc/postgresql/13/main/postgresql.conf
+
+systemctl restart postgresql
 
 su postgres << EOF
 psql postgres -tAc "SELECT 1 FROM pg_roles WHERE 
rolname='taler-merchant-httpd'" | \
@@ -30,4 +40,8 @@ EOF
 
 sudo -u taler-merchant-httpd taler-merchant-dbinit
 
-systemctl restart taler-merchant-httpd
+sed -i "s\<DB_URL_HERE>\user=postgres host=/run/postgresql 
dbname=taler-merchant\g" \
+       /etc/default/prometheus-postgres-exporter
+
+systemctl restart taler-merchant-httpd \
+                 prometheus-postgres-exporter
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index bfafc1c..d797fdf 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -44,6 +44,9 @@ systemctl restart prometheus \
                  loki \
                  promtail
 
+sed -i "s/<MERCHANT_HOST_HERE>/${MERCHANT_DOMAIN}/g" \
+       /etc/monitor/prometheus.yaml
+
 sed -i "s\<DB_URL_HERE>\postgresql://postgres@${DATABASE_DOMAIN}:5432\g" \
        /etc/default/prometheus-postgres-exporter
 

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