[libeufin] branch master updated: -use symlink for settings.js

[gnunet]

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

grothoff pushed a commit to branch master
in repository libeufin.

The following commit(s) were added to refs/heads/master by this push:
     new e3f73fab -use symlink for settings.js
e3f73fab is described below

commit e3f73fab8385eecd6be584b2bedee700a13313d7
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Mon Nov 27 07:27:53 2023 +0900

    -use symlink for settings.js
---
 debian/control                                                   | 4 ++--
 debian/{usr/share/libeufin-bank/spa => etc/libeufin}/settings.js | 0
 debian/etc/nginx/sites-available/libeufin-bank                   | 5 -----
 debian/libeufin-bank.install                                     | 3 +--
 debian/usr/share/libeufin-bank/spa/settings.js                   | 9 +--------
 5 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index f636df54..80edaf37 100644
--- a/debian/control
+++ b/debian/control
@@ -6,14 +6,14 @@ Uploaders: Christian Grothoff <grothoff@gnu.org>, Florian 
Dold <dold@taler.net>
 Build-Depends:
  debhelper-compat (= 12),
  unzip,
- openjdk-11-jdk-headless | openjdk-11-jdk | openjdk-12-jdk-headless | 
openjdk-12-jdk | openjdk-13-jdk-headless | openjdk-13-jdk | 
openjdk-14-jdk-headless | openjdk-14-jdk | openjdk-15-jdk-headless | 
openjdk-15-jdk | openjdk-16-jdk-headless | openjdk-16-jdk | 
openjdk-17-jdk-headless | openjdk-17-jdk | openjdk-18-jdk-headless | 
openjdk-18-jdk | openjdk-19-jdk-headless | openjdk-19-jdk | 
openjdk-20-jdk-headless | openjdk-20-jdk | openjdk-21-jdk-headless | 
openjdk-21-jdk
+ openjdk-17-jdk-headless | openjdk-17-jdk | openjdk-18-jdk-headless | 
openjdk-18-jdk | openjdk-19-jdk-headless | openjdk-19-jdk | 
openjdk-20-jdk-headless | openjdk-20-jdk | openjdk-21-jdk-headless | 
openjdk-21-jdk
 Standards-Version: 4.1.0
 Vcs-Git: https://git.taler.net/libeufin.git
 Homepage: https://taler.net/
 
 Package: libeufin-bank
 Architecture: all
-Depends: openjdk-11-jdk-headless | openjdk-11-jdk | openjdk-12-jdk-headless | 
openjdk-12-jdk | openjdk-13-jdk-headless | openjdk-13-jdk | 
openjdk-14-jdk-headless | openjdk-14-jdk | openjdk-15-jdk-headless | 
openjdk-15-jdk | openjdk-16-jdk-headless | openjdk-16-jdk | 
openjdk-17-jdk-headless | openjdk-17-jdk | openjdk-18-jdk-headless | 
openjdk-18-jdk | openjdk-19-jdk-headless | openjdk-19-jdk | 
openjdk-20-jdk-headless | openjdk-20-jdk | openjdk-21-jdk-headless | 
openjdk-21-jdk,
+Depends: openjdk-17-jdk-headless | openjdk-17-jdk | openjdk-18-jdk-headless | 
openjdk-18-jdk | openjdk-19-jdk-headless | openjdk-19-jdk | 
openjdk-20-jdk-headless | openjdk-20-jdk | openjdk-21-jdk-headless | 
openjdk-21-jdk,
          ${misc:Depends}
 Recommends: apache2 | nginx | httpd,
         postgresql (>= 13.0)
diff --git a/debian/usr/share/libeufin-bank/spa/settings.js 
b/debian/etc/libeufin/settings.js
similarity index 100%
copy from debian/usr/share/libeufin-bank/spa/settings.js
copy to debian/etc/libeufin/settings.js
diff --git a/debian/etc/nginx/sites-available/libeufin-bank 
b/debian/etc/nginx/sites-available/libeufin-bank
index ed9d1c41..8496a6da 100644
--- a/debian/etc/nginx/sites-available/libeufin-bank
+++ b/debian/etc/nginx/sites-available/libeufin-bank
@@ -27,9 +27,4 @@ server {
     proxy_pass http://localhost:5016;
   }
 
-  # Optional.
-  location = /settings.js {
-    alias /etc/libeufin/settings.js;
-  }
-
 }
diff --git a/debian/libeufin-bank.install b/debian/libeufin-bank.install
index 565e9196..2bb670e2 100644
--- a/debian/libeufin-bank.install
+++ b/debian/libeufin-bank.install
@@ -1,4 +1,3 @@
 debian/etc/* etc/
+debian/usr/* usr/
 
-# Install the SPA + JS config:
-debian/usr/share/libeufin/* usr/share/libeufin/
diff --git a/debian/usr/share/libeufin-bank/spa/settings.js 
b/debian/usr/share/libeufin-bank/spa/settings.js
deleted file mode 100644
index 1a88ce9d..00000000
--- a/debian/usr/share/libeufin-bank/spa/settings.js
+++ /dev/null
@@ -1,8 +0,0 @@
-globalThis.talerDemobankSettings = {
-  // Only Admin adds users
-  allowRegistrations: false,
-  bankName: "Taler Bank",
-  // Show explainer text and navbar to other demo sites
-  showDemoNav: false,
-  backendBaseURL: "http://localhost/";
-};
diff --git a/debian/usr/share/libeufin-bank/spa/settings.js 
b/debian/usr/share/libeufin-bank/spa/settings.js
new file mode 120000
index 00000000..eef4c7e7
--- /dev/null
+++ b/debian/usr/share/libeufin-bank/spa/settings.js
@@ -0,0 +1 @@
+../../../../etc/libeufin/settings.js
\ No newline at end of file

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