[taler-grid5k] 104/141: update scripts and docker build

[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 52fe8b83cb444ffd91eaba97743be52d9f852588
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Nov 4 21:33:20 2021 +0100

    update scripts and docker build
---
 configs/etc/taler/conf.d/merchant.conf |  2 +-
 docker/entrypoint.sh                   | 96 ++++++++++++++--------------------
 experiment/scripts/database.sh         |  2 +-
 experiment/scripts/merchant.sh         |  5 +-
 4 files changed, 43 insertions(+), 62 deletions(-)

diff --git a/configs/etc/taler/conf.d/merchant.conf 
b/configs/etc/taler/conf.d/merchant.conf
index b0ce84f..0f7bd93 100644
--- a/configs/etc/taler/conf.d/merchant.conf
+++ b/configs/etc/taler/conf.d/merchant.conf
@@ -4,7 +4,7 @@
 
 DATABASE = postgres
 SERVE = TCP
-PORT = 80
+PORT = 8080
 
 [merchant-exchange-perf]
 
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index ed492cc..3cb281d 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -3,54 +3,45 @@ set -e
 
 TALER_HOME=/taler
 
-cd ${TALER_HOME}/gnunet
-git checout master && pull
-git checkout ${GNUNET_COMMIT_SHA} 
-
-./bootstrap && ./configure --enable-logging=verbose --prefix=/usr
-if [ "$CLEAN" = true ]; then
-  make clean
-fi
-make -j 6
-make install
-make -j 6 dist
-
-
-cd ${TALER_HOME}/exchange
-git checkout master && git pull
-git checkout ${EXCHANGE_COMMIT_SHA} 
-
-./bootstrap && ./configure --enable-logging=verbose --prefix=/usr
-if [ "$CLEAN" = true ]; then
-  make clean
-fi
-make -j 6
-make install
-find . -name "*Makefile*" -exec sed -i '/x-taler-bank.fee/d' {} \;
-make -j 6 dist
-
+function checkout() {
+  cd "${TALER_HOME}/$1"
+  git checkout master && git pull
+  git checkout "$2"
+}
+
+function install() {
+  checkout "$1" "$2"
+  ./bootstrap 
+  ./configure --enable-logging=verbose --prefix=/usr
+  if [ "$CLEAN" = true ]; then
+    make clean
+  fi
+  if [ ! -z "$3" ]; then
+    /bin/bash -c "$3"
+  fi
+  make -j 6
+  make install
+  make -j 6 dist
+}
 
-cd ${TALER_HOME}/merchant
-git checkout master && git pull
-git checkout ${MERCHANT_COMMIT_SHA}
+install gnunet \
+        "${GNUNET_COMMIT_SHA}"
 
-./bootstrap && ./configure --enable-logging=verbose --prefix=/usr
-if [ "$CLEAN" = true ]; then
-  make clean
-fi
-make -j 6
-make -j 6 dist
+install exchange \
+        "${EXCHANGE_COMMIT_SHA}" \
+        'find . -name "*Makefile*" -exec sed -i "/x-taler-bank.fee/d" {} \;'
 
+install merchant \
+        "${MERCHANT_COMMIT_SHA}"
 
-cd ${TALER_HOME}/grid5k
-git checkout master && git pull
-git checkout ${GRID5K_COMMIT_SHA} 
+checkout grid5k \
+         "${GRID5K_COMMIT_SHA}" 
 
 cd image
 
-mv ${TALER_HOME}/gnunet/gnunet*.tar.gz grid5000/steps/data/gnunet.tar.gz
-mv ${TALER_HOME}/exchange/taler-exchange*.tar.gz 
grid5000/steps/data/exchange.tar.gz
-mv ${TALER_HOME}/merchant/taler-merchant*.tar.gz 
grid5000/steps/data/merchant.tar.gz
+mv "${TALER_HOME}"/gnunet/gnunet*.tar.gz grid5000/steps/data/gnunet.tar.gz
+mv "${TALER_HOME}"/exchange/taler-exchange*.tar.gz 
grid5000/steps/data/exchange.tar.gz
+mv "${TALER_HOME}"/merchant/taler-merchant*.tar.gz 
grid5000/steps/data/merchant.tar.gz
 
 rm -rf build
 
@@ -60,24 +51,10 @@ cd build/taler-debian11
 
 if [ -f "/root/cert.pem" ]; then
 
-  mkdir -p /root/.ssh/
-  
-  echo "
-  Host g5k
-    User ${GRID5K_USER}
-    HostName access.grid5000.fr
-    IdentityFile /root/cert.pem
-    ForwardAgent no
-  
-  Host *.g5k
-    User ${GRID5K_USER}
-    ProxyCommand ssh g5k -W \"\$(basename %h .g5k):%p\"
-    ForwardAgent no
-  " >> /root/.ssh/config
-  
   eval $(ssh-agent)
   
   if [[ -f "/root/cert.pem" ]]; then
+
     if [[ "${GRID5K_CERT_PASSWD}" != "" ]]; then
       /usr/bin/expect -c "
       spawn ssh-add /root/cert.pem;
@@ -88,18 +65,23 @@ if [ -f "/root/cert.pem" ]; then
     else 
       ssh-add /root/cert.pem
     fi
+
   fi
   
   mv taler-debian11.dsc taler-debian11.dsc.bak
   
   IFS=, read -ra G5K_HOSTS <<< "${GRID5K_DEST}" 
+
   for G5K_HOST in "${G5K_HOSTS[@]}"; do
     echo "Copying image to ${G5K_HOST}"
+
     sed "s/<G5K_HOST>/${G5K_HOST}/g; s/<G5K_USER>/${GRID5K_USER}/g" \
         taler-debian11.dsc.bak > taler-debian11.dsc
+
     scp -o StrictHostKeyChecking=no taler-debian11.tar.zst taler-debian11.dsc \
-        g5k:"${G5K_HOST}"/public/
+        "${GRID5K_USER}@access.grid5000.fr:${G5K_HOST}"/public/
   done 
+
 fi
 
 if [ -d "/root/output" ]; then
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index da9437d..da0fb17 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
-hared_preload_libraries='pg_stat_statements,auto_explain'
+shared_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 137a6d8..2861d71 100755
--- a/experiment/scripts/merchant.sh
+++ b/experiment/scripts/merchant.sh
@@ -19,9 +19,8 @@ sed -i -e 
"s\<EXCHANGE_URL_HERE>\http://${EXCHANGE_DOMAIN}/\g"; \
        -e "s/<EXCHANGE_MASTER_KEY_HERE>/${MASTER_KEY}/g" \
         /etc/taler/conf.d/merchant.conf
 
-echo "
-local all all trust
-" >> /etc/postgresql/13/main/pg_hba.conf
+sed -i "s/local\s* all\s* postgres\s* peer/local all postgres trust/g" \
+       /etc/postgresql/13/main/pg_hba.conf
 
 echo "
 shared_preload_libraries='pg_stat_statements,auto_explain'

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