[taler-grid5k] 96/189: fixes, add lookahead sign as param

[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 23f01704df94cd1f8665bcfa91cb7eb73b82efd0
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sat Mar 19 19:13:19 2022 +0100

    fixes, add lookahead sign as param
---
 configs/etc/nginx/sites-available/merchant    |  2 +-
 configs/etc/taler/conf.d/exchange-secmod.conf |  6 +++---
 experiment/env                                |  5 +++++
 experiment/scripts/benchmark.sh               |  2 +-
 experiment/scripts/helpers.sh                 |  3 +++
 experiment/scripts/setup.sh                   | 13 +++++++++++++
 experiment/taler.rspec                        | 13 ++++++++++---
 7 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/configs/etc/nginx/sites-available/merchant 
b/configs/etc/nginx/sites-available/merchant
index 2f785a9..5585744 100644
--- a/configs/etc/nginx/sites-available/merchant
+++ b/configs/etc/nginx/sites-available/merchant
@@ -8,7 +8,7 @@ server {
   server_name 0.0.0.0;
 
   location / {
-     proxy_pass http://unix:/var/run/taler/mercahnt-httpd/merchant.sock;
+     proxy_pass http://unix:/var/run/taler/merchant-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/exchange-secmod.conf 
b/configs/etc/taler/conf.d/exchange-secmod.conf
index ebea894..55fa5a2 100644
--- a/configs/etc/taler/conf.d/exchange-secmod.conf
+++ b/configs/etc/taler/conf.d/exchange-secmod.conf
@@ -1,17 +1,17 @@
 [taler-exchange-secmod-rsa]
 
-LOOKAHEAD_SIGN = 2 days
+LOOKAHEAD_SIGN = <LOOKAHEAD_SIGN_HERE>
 SM_PRIV_KEY = <SM_KEY_DIR_HERE>/exchange-secmod-rsa/secmod-private-key
 KEY_DIR = <SM_KEY_DIR_HERE>/exchange-secmod-rsa/keys
 
 [taler-exchange-secmod-eddsa]
 
-LOOKAHEAD_SIGN = 2 days
+LOOKAHEAD_SIGN = <LOOKAHEAD_SIGN_HERE>
 SM_PRIV_KEY = <SM_KEY_DIR_HERE>/exchange-secmod-eddsa/secmod-private-key
 KEY_DIR = <SM_KEY_DIR_HERE>/exchange-secmod-eddsa/keys
 
 [taler-exchange-secmod-cs]
 
-LOOKAHEAD_SIGN = 2 days
+LOOKAHEAD_SIGN = <LOOKAHEAD_SIGN_HERE>
 SM_PRIV_KEY = <SM_KEY_DIR_HERE>/exchange-secmod-cs/secmod-private-key
 KEY_DIR = <SM_KEY_DIR_HERE>/exchange-secmod-cs/keys
diff --git a/experiment/env b/experiment/env
index f3e9bd6..7a83154 100644
--- a/experiment/env
+++ b/experiment/env
@@ -67,6 +67,9 @@ EXCHANGE_CIPHER=RSA
 # When using the RSA cipher, which key size to use
 RSA_KEY_SIZE=2048
 
+# The lookahead sign duration for the exchange secmods
+LOOKAHEAD_SIGN="2 days"
+
 # Token used in Authorize: Bearer $TOKEN for the merchant
 TALER_MERCHANT_TOKEN=taler-perf
 
@@ -104,6 +107,8 @@ NUM_PARTITIONS=10
 # This is a bulk size with default = 10
 # Start another bunch with `taler-perf start wallet <N>`
 NUM_WALLET_PROCESSES=10
+# Which benchmark to use of the wallet-cli (bench1, bench2)
+WALLET_BENCHMARK=bench1
 # Request the exchange via https instead of http
 WALLET_SECURE_EXCHANGE=true
 # Needed for wallets to accept self signed certificates
diff --git a/experiment/scripts/benchmark.sh b/experiment/scripts/benchmark.sh
index e3a11e1..47df61c 100755
--- a/experiment/scripts/benchmark.sh
+++ b/experiment/scripts/benchmark.sh
@@ -27,7 +27,7 @@ function start_wallet_bench() {
   
   taler-wallet-cli \
       -L ${LOG_LEVEL} \
-      advanced bench1 \
+      advanced ${WALLET_BENCHMARK} \
         --config-json "
   {
     \"exchange\": \"${PROTO}://${PROXY_DOMAIN}/\",
diff --git a/experiment/scripts/helpers.sh b/experiment/scripts/helpers.sh
index 98a18e4..32d438a 100755
--- a/experiment/scripts/helpers.sh
+++ b/experiment/scripts/helpers.sh
@@ -141,6 +141,9 @@ function setup_exchange_config_without_master_key() {
          -e "s/<AGGREGATOR_SHARD_SIZE_HERE>/${AGGREGATOR_SHARD_SIZE}/g" \
        /etc/taler/conf.d/exchange-business.conf
 
+  sed -i "s/<LOOKAHEAD_SIGN_HERE>/${LOOKAHEAD_SIGN}/g" \
+      /etc/taler/conf.d/exchange-secmod.conf
+
   if [[ ${NUM_EXCHANGES} != "1" ]]; then
     # Use a shared NFS key directory when we have multiple exchange-httpd 
servers
     sed -i "s|<SM_KEY_DIR_HERE>|/home/${G5K_USER}/taler|g" \
diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index 9e47eb1..31a3b4a 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -175,6 +175,19 @@ function setup_dns() {
   fi
 }
 
+function clean_previous_setup() {
+  # Stop all important services
+  systemctl stop taler-exchange-* \
+                 postgresql \
+                promtail \
+                loki \
+                || true
+  # Remove access to postgres for all nodes
+  sed -i "/172.16.0.0\/12/d" \
+         /etc/postgresql/${POSTGRES_VERSION}/main/pg_hba.conf
+}
+
+clean_previous_setup
 parse_experiment_nodes
 setup_log_dir
 setup_environment
diff --git a/experiment/taler.rspec b/experiment/taler.rspec
index 050b227..5df06cd 100644
--- a/experiment/taler.rspec
+++ b/experiment/taler.rspec
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2022-03-16T16:01:13.787+01:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2022-03-19T12:40:15.602+01:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
   <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
@@ -26,7 +26,7 @@
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="276.5" 
y="214.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="232.5" 
y="214.5"/>
   </node>
   <node client_id="Monitor" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -203,4 +203,11 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="360.0" 
y="162.5"/>
   </node>
-</rspec>
+  <node client_id="Proxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="dahu-grenoble"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="346.0" 
y="214.5"/>
+  </node>
+</rspec>
\ No newline at end of file

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