[taler-grid5k] 32/141: add taler default env

[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 9a248b01755f0d9c994810c9746cf09f11fd37db
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Mon Oct 11 20:11:44 2021 +0200

    add taler default env
---
 configs/etc/default/taler-exchange-httpd           |  1 +
 configs/etc/nginx/sites-available/exchange         | 14 --------------
 .../systemd/system/taler-exchange-httpd.service    | 22 ++++++++++++++++++++++
 .../lib/systemd/system/taler-exchange-httpd.socket | 14 ++++++++++++++
 experiment/scripts/database.sh                     |  1 -
 experiment/scripts/exchange.sh                     | 13 +++++++++++--
 experiment/scripts/wallet.sh                       | 11 ++++++-----
 experiment/setup.sh                                |  4 ++--
 experiment/taler-perf-any.rspec                    | 12 ++++++------
 experiment/taler-perf.rspec                        |  4 ++--
 notes.txt                                          |  2 ++
 11 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/configs/etc/default/taler-exchange-httpd 
b/configs/etc/default/taler-exchange-httpd
new file mode 100644
index 0000000..99052e7
--- /dev/null
+++ b/configs/etc/default/taler-exchange-httpd
@@ -0,0 +1 @@
+ARGS="-L INFO"
diff --git a/configs/etc/nginx/sites-available/exchange 
b/configs/etc/nginx/sites-available/exchange
deleted file mode 100644
index d776ca4..0000000
--- a/configs/etc/nginx/sites-available/exchange
+++ /dev/null
@@ -1,14 +0,0 @@
-server {
-  listen 80;
-  listen [::]:80;
-
-  server_name localhost;
-
-  location / {
-     proxy_pass http://unix:/run/taler/exchange-httpd/exchange-http.sock:/;
-     proxy_redirect off;
-     proxy_set_header Host $host;
-     #proxy_set_header X-Forwarded-Host "example.com";
-     #proxy_set_header X-Forwarded-Proto "https";
-  }
-}
diff --git a/configs/lib/systemd/system/taler-exchange-httpd.service 
b/configs/lib/systemd/system/taler-exchange-httpd.service
new file mode 100755
index 0000000..2689816
--- /dev/null
+++ b/configs/lib/systemd/system/taler-exchange-httpd.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=GNU Taler payment system exchange REST API
+AssertPathExists=/run/taler/exchange-httpd
+Requires=taler-exchange-httpd.socket taler-exchange-secmod-rsa.service 
taler-exchange-secmod-eddsa.service
+After=postgres.service network.target taler-exchange-secmod-rsa.service 
taler-exchange-secmod-eddsa.service
+PartOf=taler-exchange.target
+
+[Service]
+User=taler-exchange-httpd
+Type=simple
+Restart=on-failure
+EnvironmentFile=/etc/default/taler-exchange-httpd
+ExecStart=/usr/bin/taler-exchange-httpd -c /etc/taler/taler.conf $ARGS
+StandardOutput=journal
+StandardError=journal
+PrivateTmp=no
+PrivateDevices=yes
+ProtectSystem=full
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/configs/lib/systemd/system/taler-exchange-httpd.socket 
b/configs/lib/systemd/system/taler-exchange-httpd.socket
new file mode 100755
index 0000000..59aa5be
--- /dev/null
+++ b/configs/lib/systemd/system/taler-exchange-httpd.socket
@@ -0,0 +1,14 @@
+[Unit]
+Description=Taler Exchange Socket
+PartOf=taler-exchange-httpd.service
+
+[Socket]
+ListenStream=80
+Accept=no
+Service=taler-exchange-httpd.service
+SocketUser=taler-exchange-httpd
+SocketGroup=www-data
+SocketMode=0660
+
+[Install]
+WantedBy=sockets.target
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index fc53da7..a5d493a 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -23,7 +23,6 @@ EOF
 
 su taler-exchange-httpd -s /bin/bash << EOF
 psql -d "${DB_NAME}"
-GRANT ALL PRIVILEGES ON DATABASE "${DB_NAME}" TO "${DB_USER}";
 GRANT SELECT,INSERT,UPDATE ON ALL TABLES IN SCHEMA public TO "${DB_USER}";
 GRANT USAGE ON ALL SEQUENCES IN SCHEMA public TO "${DB_USER}";
 EOF
diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index 0fe5e52..3708918 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -18,8 +18,6 @@ MASTER_KEY=$(sudo -u taler-exchange-offline 
taler-exchange-offline setup)
 sed -i "s/<MASTER_KEY_HERE>/${MASTER_KEY}/g" \
        /etc/taler/conf.d/exchange-business.conf
 
-ln -sf /etc/nginx/sites-available/exchange /etc/nginx/sites-enabled/exchange
-
 until PGPASSWORD="${DB_PASSWORD}" psql \
       -h "${DATABASE_DOMAIN}" \
       -U "${DB_USER}" \
@@ -34,6 +32,17 @@ sleep 1
 
 systemctl start taler-exchange.target nginx
 
+until wget http://${EXCHANGE_DOMAIN}/management/keys \
+      --spider \
+      --timeout=5 \
+      -q;
+do
+  echo "Exchange not ready yet"
+  sleep 1
+done
+
+sleep 60
+
 wget http://${EXCHANGE_DOMAIN}/management/keys
 
 taler-exchange-offline download > sig-req.json
diff --git a/experiment/scripts/wallet.sh b/experiment/scripts/wallet.sh
index 9ca1c41..f62efa8 100755
--- a/experiment/scripts/wallet.sh
+++ b/experiment/scripts/wallet.sh
@@ -1,13 +1,14 @@
 #!/bin/bash
 set -eux
 
-until wget http://${PROXY_DOMAIN}/management/keys \
-       --spider \
-       -q;
+until wget http://${PROXY_DOMAIN}/keys \
+      --spider \
+      --timeout=5 \
+      -q;
 do
   echo "Exchange not ready yet"
-  sleep 5
+  sleep 1
 done
 
-#taler-wallet-cli advanced withdraw-manually --exchange 
http://${PROXY_DOMAIN}/ --amount KUDOS:10
+taler-wallet-cli advanced withdraw-manually --exchange http://${PROXY_DOMAIN}/ 
--amount KUDOS:10
 
diff --git a/experiment/setup.sh b/experiment/setup.sh
index f5eee2f..4e353c1 100644
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -15,8 +15,8 @@ cd "${G5K_HOME}" && git checkout node-setup && git pull && cd
 # Remove default nginx config
 rm /etc/nginx/sites-enabled/default > /dev/null 2>&1 || true
 
-# Override default /etc/ with the one from this Git.
-cp -r "${G5K_HOME}"/configs/etc/* /etc
+# Override default configurations with the one from this Git.
+cp -r "${G5K_HOME}"/configs/* /
 
 # Add the dyndns key which will be used by the dns update
 cat << EOF > /root/ddns.key 
diff --git a/experiment/taler-perf-any.rspec b/experiment/taler-perf-any.rspec
index 24335b6..4eb806e 100644
--- a/experiment/taler-perf-any.rspec
+++ b/experiment/taler-perf-any.rspec
@@ -1,32 +1,32 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-09T17:10:59.347+02: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="2021-10-11T13:44:52.682+02: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.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="514.0" 
y="84.5"/>
   </node>
   <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="607.0" 
y="188.5"/>
   </node>
   <node client_id="Wallet" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="607.5" 
y="347.5"/>
   </node>
   <node client_id="Bank" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="699.0" 
y="82.5"/>
   </node>
   <node client_id="Exch-Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="603.5" 
y="226.5"/>
   </node>
diff --git a/experiment/taler-perf.rspec b/experiment/taler-perf.rspec
index 28c6405..22cb0e4 100644
--- a/experiment/taler-perf.rspec
+++ b/experiment/taler-perf.rspec
@@ -1,10 +1,10 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-09T17:10:45.615+02: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="2021-10-11T19:19:01.402+02: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.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <hardware_type name="gros-nancy"/>
+    <hardware_type name="grisou-nancy"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="514.0" 
y="84.5"/>
   </node>
   <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
diff --git a/notes.txt b/notes.txt
index 80beb10..5875d7c 100644
--- a/notes.txt
+++ b/notes.txt
@@ -5,4 +5,6 @@
 * jFed: Reserve not working for grid5000 resources
 * jFed: Error do not clearly show which nodes failed allocating
   its hard to detect problems when using many nodes - should be clearer
+  bsp error: Some requiered resource was not available at this time. (which?!)
 * jFed: Changing Node or HW type does sometimes not apply and is not saved
+* Online status monitoing not up to date

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