libeufin

commit 6ee606bbadea26cd860ad145314b08dc8c6d6f24
parent dddae4c57ce1e31439aba078973f2c46d4246d62
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat,  4 Mar 2023 14:48:45 +0100

fix debian package DB logic

Diffstat:
M
debian/db/install-nexus/pgsql
 | 
5
+++--
M
debian/db/install-sandbox/pgsql
 | 
2
+-
M
debian/rules
 | 
7
+++++++

3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/debian/db/install-nexus/pgsql b/debian/db/install-nexus/pgsql
@@ -4,14 +4,15 @@ set -eu
 
 # Get database settings from dbconfig-common and write libeufin configuration files.
 if [ -f /etc/dbconfig-common/libeufin-nexus.conf ]; then
-  . /etc/dbconfig-common/libeufin-nexus.conf
+    . /etc/dbconfig-common/libeufin-nexus
+    .conf
   case "$dbc_dbtype" in
   pgsql)
     # We assume ident auth here.  We might support password auth later.
     mkdir -p /etc/libeufin/
     echo -e "LIBEUFIN_NEXUS_PORT=5017" >> \
          /etc/libeufin/nexus.env
-    echo -e "LIBEUFIN_NEXUS_DB_CONNECTION=jdbc:postgres:///${dbc_dbname}\n\n" >> \
+    echo -e "LIBEUFIN_NEXUS_DB_CONNECTION=jdbc:postgres:///${dbc_dbserver}/${dbc_dbname}?user=${dbc_dbuser}&password=${dbc_dbpass}\n\n" >> \
 	 /etc/libeufin/nexus.env
 
     # Allow the libeufin-sandbox/nexus user to create schemas.
diff --git a/debian/db/install-sandbox/pgsql b/debian/db/install-sandbox/pgsql
@@ -11,7 +11,7 @@ if [ -f /etc/dbconfig-common/libeufin-sandbox.conf ]; then
     mkdir -p /etc/libeufin/
     echo -e "LIBEUFIN_SANDBOX_PORT=5016" >> \
          /etc/libeufin/sandbox.env
-    echo -e "LIBEUFIN_SANDBOX_DB_CONNECTION=jdbc:postgres:///${dbc_dbname}\n\n" >> \
+    echo -e "LIBEUFIN_SANDBOX_DB_CONNECTION=jdbc:postgres://${dbc_dbserver}/${dbc_dbname}?user=${dbc_dbuser}&password=${dbc_dbpass}\n\n" >> \
 	 /etc/libeufin/sandbox.env
 
 
diff --git a/debian/rules b/debian/rules
@@ -50,12 +50,19 @@ override_dh_install:
 	mkdir -p debian/libeufin-nexus/usr/bin/
 	mv debian/libeufin-common/usr/bin/libeufin-nexus \
            debian/libeufin-nexus/usr/bin/
+	mkdir -p debian/libeufin-nexus/usr/share/libeufin/bin/
+	mv debian/libeufin/usr/share/libeufin/bin/libeufin-nexus \
+           debian/libeufin-nexus/usr/share/libeufin/bin/
+
 	mkdir -p debian/libeufin-sandbox/usr/share/libeufin/lib/
 	mv debian/libeufin-common/usr/share/libeufin/lib/sandbox-*.jar \
            debian/libeufin-sandbox/usr/share/libeufin/lib/
 	mkdir -p debian/libeufin-sandbox/usr/bin/
 	mv debian/libeufin-common/usr/bin/libeufin-sandbox \
            debian/libeufin-sandbox/usr/bin/
+	mkdir -p debian/libeufin-sandbox/usr/share/libeufin/bin/
+	mv debian/libeufin/usr/share/libeufin/bin/libeufin-sandbox \
+           debian/libeufin-sandbox/usr/share/libeufin/bin/
 	rm -rf debian/libeufin/
 
 override_dh_installsystemd: