[taler-deployment] branch master updated: serve bank UI settings

[gnunet]

This is an automated email from the git hooks/post-receive script.

ms pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 569c937  serve bank UI settings
569c937 is described below

commit 569c9374ea9155808d6b3bfe72730770f1382202
Author: MS <ms@taler.net>
AuthorDate: Wed Nov 16 15:46:22 2022 +0100

    serve bank UI settings
---
 docker/demo/config/deployment.conf                  |  3 +++
 docker/demo/config/deployment.ts                    |  2 ++
 docker/demo/images/libeufin/Dockerfile              |  1 +
 docker/demo/images/libeufin/demobank-ui-settings.js | 15 +++++++++++++++
 docker/demo/images/libeufin/nginx.conf              |  1 -
 docker/demo/images/libeufin/startup.sh              | 15 ++++++++++++++-
 6 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/docker/demo/config/deployment.conf 
b/docker/demo/config/deployment.conf
index 113e0f0..5989a92 100644
--- a/docker/demo/config/deployment.conf
+++ b/docker/demo/config/deployment.conf
@@ -13,6 +13,9 @@ survey-url = http://localhost:5561/
 sync-url = http://localhost:5563/
 bank-url = http://localhost:15002/
 
+# Pointed to by the bank UI
+bank-backend-url = http://localhost:15000/
+
 # Bank accounts
 exchange-sandbox-username = exchange-at-sandbox
 exchange-sandbox-password = secret-at-sandbox
diff --git a/docker/demo/config/deployment.ts b/docker/demo/config/deployment.ts
index fc4f22c..6805171 100644
--- a/docker/demo/config/deployment.ts
+++ b/docker/demo/config/deployment.ts
@@ -31,6 +31,8 @@ interface TalerConfigUrls {
   surveyUrl: URL;
   syncUrl: URL;
   // was bank-url in INI config:
+  bankWebUiUrl: URL;
+  // Used to point the Web UI.
   bankSandboxUrl: URL;
   // was default-exchange in INI config:
   exchangeUrl: URL;
diff --git a/docker/demo/images/libeufin/Dockerfile 
b/docker/demo/images/libeufin/Dockerfile
index e55c80d..12768b9 100644
--- a/docker/demo/images/libeufin/Dockerfile
+++ b/docker/demo/images/libeufin/Dockerfile
@@ -2,6 +2,7 @@ FROM taler_local/taler_base
 
 COPY startup.sh /
 COPY create_bank_accounts.sh /
+COPY demobank-ui-settings.js /usr/local/share/taler/demobank-ui/
 RUN chmod +x /startup.sh
 COPY nginx.conf /
 ENTRYPOINT /startup.sh
diff --git a/docker/demo/images/libeufin/demobank-ui-settings.js 
b/docker/demo/images/libeufin/demobank-ui-settings.js
new file mode 100644
index 0000000..76c4c4c
--- /dev/null
+++ b/docker/demo/images/libeufin/demobank-ui-settings.js
@@ -0,0 +1,15 @@
+globalThis.talerDemobankSettings = {
+  allowRegistrations: true,
+  bankName: "Taler Bank",
+  // Show explainer text and navbar to other demo sites
+  showDemoNav: true,
+  // Names and links for other demo sites to show in the navbar
+  demoSites: [
+    ["Landing", "__LANDING_URL__"],
+    ["Bank", "__BANK_WEBUI_URL__"],
+    ["Essay Shop", "__BLOG_URL__"],
+    ["Donations", "__DONATIONS_URL__"],
+    ["Survey", "__SURVEY_URL__"],
+  ],
+  bankBaseUrl: "__BANK_BACKEND_URL__"
+};
diff --git a/docker/demo/images/libeufin/nginx.conf 
b/docker/demo/images/libeufin/nginx.conf
index 42c7940..d5436f5 100644
--- a/docker/demo/images/libeufin/nginx.conf
+++ b/docker/demo/images/libeufin/nginx.conf
@@ -9,7 +9,6 @@ http {
     listen [::]:80;
     location / {
       root /usr/local/share/taler/demobank-ui;
-      # Serve demobank-ui-settings.js here.
     }
   }
 }
diff --git a/docker/demo/images/libeufin/startup.sh 
b/docker/demo/images/libeufin/startup.sh
index bd89d8e..2b33a01 100644
--- a/docker/demo/images/libeufin/startup.sh
+++ b/docker/demo/images/libeufin/startup.sh
@@ -169,7 +169,20 @@ test -a $INIT_MARKER || libeufin-cli facades \
   talerconn $NEXUS_IMPORTED_BANKACCOUNT
 echo DONE
 # starting the SPA
-echo "INFO: SPA custom values (demobank-ui-settings.js) not configured."
+BLOG_URL=`taler-config -c /config/deployment.conf -s taler-deployment -o 
blog-url`
+DONATIONS_URL=`taler-config -c /config/deployment.conf -s taler-deployment -o 
donations-url`
+SURVEY_URL=`taler-config -c /config/deployment.conf -s taler-deployment -o 
survey-url`
+LANDING_URL=`taler-config -c /config/deployment.conf -s taler-deployment -o 
landing-url`
+BANK_WEBUI_URL=`taler-config -c /config/deployment.conf -s taler-deployment -o 
bank-url`
+BANK_BACKEND_URL=`taler-config -c /config/deployment.conf -s taler-deployment 
-o bank-backend-url`
+
+sed -i "s;__LANDING_URL__;${LANDING_URL};" 
/usr/local/share/taler/demobank-ui/demobank-ui-settings.js
+sed -i "s;__BLOG_URL__;${BLOG_URL};" 
/usr/local/share/taler/demobank-ui/demobank-ui-settings.js
+sed -i "s;__DONATIONS_URL__;${DONATIONS_URL};" 
/usr/local/share/taler/demobank-ui/demobank-ui-settings.js
+sed -i "s;__SURVEY_URL__;${SURVEY_URL};" 
/usr/local/share/taler/demobank-ui/demobank-ui-settings.js
+sed -i "s;__BANK_WEBUI_URL__;${BANK_WEBUI_URL};" 
/usr/local/share/taler/demobank-ui/demobank-ui-settings.js
+sed -i "s;__BANK_BACKEND_URL__;${BANK_BACKEND_URL};" 
/usr/local/share/taler/demobank-ui/demobank-ui-settings.js
+
 nginx -c /nginx.conf 2>&1 | rotatelogs -e /logs/bank-ui-%Y-%m-%d 86400 &
 touch $INIT_MARKER
 

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