[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libeufin] branch master updated: split libeufin package
|
From: |
gnunet |
|
Subject: |
[libeufin] branch master updated: split libeufin package |
|
Date: |
Sat, 04 Mar 2023 13:36:18 +0100 |
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 eba49fcf split libeufin package
eba49fcf is described below
commit eba49fcf47c236b3982c9bdfb79c12c5a24e1c4d
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Mar 4 13:36:15 2023 +0100
split libeufin package
---
debian/control | 28 +++++++++++++++++++++-
debian/db/{install => install-nexus}/pgsql | 13 ++++------
debian/db/{install => install-sandbox}/pgsql | 9 +++----
debian/libeufin-common.install | 1 +
debian/{libeufin.config => libeufin-nexus.config} | 6 ++---
debian/libeufin-nexus.install | 2 ++
...rvice => libeufin-nexus.libeufin-nexus.service} | 0
.../{libeufin.postinst => libeufin-nexus.postinst} | 15 ------------
debian/{libeufin.postrm => libeufin-nexus.postrm} | 1 -
debian/{libeufin.prerm => libeufin-nexus.prerm} | 2 --
.../{libeufin.config => libeufin-sandbox.config} | 6 ++---
.../{libeufin.install => libeufin-sandbox.install} | 2 +-
...e => libeufin-sandbox.libeufin-sandbox.service} | 0
...libeufin.postinst => libeufin-sandbox.postinst} | 15 ------------
.../{libeufin.postrm => libeufin-sandbox.postrm} | 1 -
debian/{libeufin.prerm => libeufin-sandbox.prerm} | 2 --
debian/libeufin.tmpfiles | 3 ---
debian/rules | 18 ++++++++++++--
18 files changed, 58 insertions(+), 66 deletions(-)
diff --git a/debian/control b/debian/control
index 18934e9f..70967a15 100644
--- a/debian/control
+++ b/debian/control
@@ -11,15 +11,41 @@ Standards-Version: 4.1.0
Vcs-Git: https://git.taler.net/libeufin.git
Homepage: https://taler.net/
-Package: libeufin
+Package: libeufin-common
+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,
+ python3 (>= 3.7),
+ python3-click,
+ python3-requests,
+ ${misc:Depends}
+Recommends:
+Description: Resources shared between libeufin-nexus and libeufin-sandbox.
+
+Package: libeufin-nexus
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,
dbconfig-pgsql | dbconfig-no-thanks,
python3 (>= 3.7),
python3-click,
python3-requests,
+ libeufin-common,
apache2 | nginx | httpd,
${misc:Depends}
Recommends:
Description: Software package to access FinTS/EBICS based
core banking systems.
+
+
+Package: libeufin-sandbox
+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,
+ dbconfig-pgsql | dbconfig-no-thanks,
+ python3 (>= 3.7),
+ python3-click,
+ python3-requests,
+ libeufin-common,
+ apache2 | nginx | httpd,
+ ${misc:Depends}
+Recommends:
+Description: Software package to provide a reference
+ implementation of a FinTS/EBICS based core banking system.
diff --git a/debian/db/install/pgsql b/debian/db/install-nexus/pgsql
similarity index 60%
copy from debian/db/install/pgsql
copy to debian/db/install-nexus/pgsql
index d820d3ec..a17e637c 100755
--- a/debian/db/install/pgsql
+++ b/debian/db/install-nexus/pgsql
@@ -7,20 +7,15 @@ if [ -f /etc/dbconfig-common/taler-libeufin.conf ]; then
. /etc/dbconfig-common/taler-libeufin.conf
case "$dbc_dbtype" in
pgsql)
- # We assume ident auth here. We might support password auth later.
- echo -e "LIBEUFIN_NEXUS_PORT=5017" >> \
+ # 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"
>> \
/etc/libeufin/nexus.env
- echo -e "LIBEUFIN_SANDBOX_PORT=5016" >> \
- /etc/libeufin/sandbox.env
- echo -e
"LIBEUFIN_SANDBOX_DB_CONNECTION=jdbc:postgres:///${dbc_dbname}\n\n" >> \
- /etc/libeufin/sandbox.env
-
# Allow the libeufin-sandbox/nexus user to create schemas.
- # Note: user name and DB name must match here.
- echo "GRANT CREATE ON DATABASE \"${dbc_dbname}\" TO \"${dbc_dbname}\";" |
sudo -u postgres psql -f -
+ echo "GRANT CREATE ON DATABASE \"${dbc_dbname}\" TO \"libeufin-nexus\";" |
sudo -u postgres psql -f -
;;
sqlite3)
# Later: use something like:
diff --git a/debian/db/install/pgsql b/debian/db/install-sandbox/pgsql
similarity index 69%
rename from debian/db/install/pgsql
rename to debian/db/install-sandbox/pgsql
index d820d3ec..63e7bbd0 100755
--- a/debian/db/install/pgsql
+++ b/debian/db/install-sandbox/pgsql
@@ -7,11 +7,8 @@ if [ -f /etc/dbconfig-common/taler-libeufin.conf ]; then
. /etc/dbconfig-common/taler-libeufin.conf
case "$dbc_dbtype" in
pgsql)
- # We assume ident auth here. We might support password auth later.
- echo -e "LIBEUFIN_NEXUS_PORT=5017" >> \
- /etc/libeufin/nexus.env
- echo -e "LIBEUFIN_NEXUS_DB_CONNECTION=jdbc:postgres:///${dbc_dbname}\n\n"
>> \
- /etc/libeufin/nexus.env
+ # We assume ident auth here. We might support password auth later.
+ 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" >> \
@@ -20,7 +17,7 @@ if [ -f /etc/dbconfig-common/taler-libeufin.conf ]; then
# Allow the libeufin-sandbox/nexus user to create schemas.
# Note: user name and DB name must match here.
- echo "GRANT CREATE ON DATABASE \"${dbc_dbname}\" TO \"${dbc_dbname}\";" |
sudo -u postgres psql -f -
+ echo "GRANT CREATE ON DATABASE \"${dbc_dbname}\" TO \"libeufin-sandbox\";"
| sudo -u postgres psql -f -
;;
sqlite3)
# Later: use something like:
diff --git a/debian/libeufin-common.install b/debian/libeufin-common.install
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/debian/libeufin-common.install
@@ -0,0 +1 @@
+
diff --git a/debian/libeufin.config b/debian/libeufin-nexus.config
similarity index 83%
copy from debian/libeufin.config
copy to debian/libeufin-nexus.config
index c67bd59e..cdd0833e 100644
--- a/debian/libeufin.config
+++ b/debian/libeufin-nexus.config
@@ -3,9 +3,8 @@
set -e
. /usr/share/debconf/confmodule
-
-_USERNAME=libeufin
-_GROUPNAME=libeufin
+_USERNAME=libeufin-nexus
+_GROUPNAME=libeufin-nexus
# For now, we only support postgres
dbc_dbtypes=pgsql
@@ -18,7 +17,6 @@ dbc_authmethod_admin=ident
if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
. /usr/share/dbconfig-common/dpkg/config.pgsql
dbc_go libeufin-nexus "$@"
- dbc_go libeufin-sandbox "$@"
fi
db_stop
diff --git a/debian/libeufin-nexus.install b/debian/libeufin-nexus.install
new file mode 100644
index 00000000..0a5e6566
--- /dev/null
+++ b/debian/libeufin-nexus.install
@@ -0,0 +1,2 @@
+# Files needed by dbconf
+debian/db/install-nexus/*
usr/share/dbconfig-common/scripts/libeufin-nexus/install/
diff --git a/debian/libeufin.libeufin-nexus.service
b/debian/libeufin-nexus.libeufin-nexus.service
similarity index 100%
rename from debian/libeufin.libeufin-nexus.service
rename to debian/libeufin-nexus.libeufin-nexus.service
diff --git a/debian/libeufin.postinst b/debian/libeufin-nexus.postinst
similarity index 71%
copy from debian/libeufin.postinst
copy to debian/libeufin-nexus.postinst
index d33fce93..bbe059c4 100644
--- a/debian/libeufin.postinst
+++ b/debian/libeufin-nexus.postinst
@@ -8,22 +8,17 @@ fi
if [ "$1" = "remove" ]; then
if [ -x "/usr/bin/deb-systemd-helper" ]; then
deb-systemd-helper mask 'libeufin-nexus.service' >/dev/null ||
true
- deb-systemd-helper mask 'libeufin-sandbox.service' >/dev/null
|| true
fi
fi
if [ "$1" = "purge" ]; then
if [ -x "/usr/bin/deb-systemd-helper" ]; then
deb-systemd-helper purge 'libeufin-nexus.service' >/dev/null
|| true
- deb-systemd-helper purge 'libeufin-sandbox.service' >/dev/null
|| true
deb-systemd-helper unmask 'libeufin-nexus.service' >/dev/null
|| true
- deb-systemd-helper unmask 'libeufin-sandbox.service'
>/dev/null || true
fi
fi
nexus_user=libeufin-nexus
-sandbox_user=libeufin-sandbox
nexus_group=libeufin-nexus
-sandbox_group=libeufin-sandbox
libeufin_home=/var/lib/libeufin
# Set permissions for sqlite3 file
@@ -41,26 +36,16 @@ case "${1}" in
addgroup --quiet --system $nexus_group
fi
- if ! getent group $sandbox_group >/dev/null; then
- addgroup --quiet --system $sandbox_group
- fi
-
# Create users if needed
if ! getent passwd $nexus_user >/dev/null; then
adduser --quiet --system --no-create-home --ingroup $nexus_group --home
$libeufin_home $nexus_user
fi
- # Create users if needed
- if ! getent passwd $sandbox_user >/dev/null; then
- adduser --quiet --system --no-create-home --ingroup $sandbox_group
--home $libeufin_home $sandbox_user
- fi
-
# Set up postgres database (needs dbconfig-pgsql package)
if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then
. /usr/share/dbconfig-common/dpkg/postinst.pgsql
dbc_pgsql_createdb_encoding="UTF8"
dbc_go libeufin-nexus "$@"
- dbc_go libeufin-sandbox "$@"
fi
;;
diff --git a/debian/libeufin.postrm b/debian/libeufin-nexus.postrm
similarity index 94%
copy from debian/libeufin.postrm
copy to debian/libeufin-nexus.postrm
index d2564ea3..1a4acbd6 100644
--- a/debian/libeufin.postrm
+++ b/debian/libeufin-nexus.postrm
@@ -9,7 +9,6 @@ fi
if [ -f /usr/share/dbconfig-common/dpkg/postrm.pgsql ]; then
. /usr/share/dbconfig-common/dpkg/postrm.pgsql
dbc_go libeufin-nexus "$@"
- dbc_go libeufin-sandbox "$@"
fi
case "${1}" in
diff --git a/debian/libeufin.prerm b/debian/libeufin-nexus.prerm
similarity index 79%
copy from debian/libeufin.prerm
copy to debian/libeufin-nexus.prerm
index 99106a6e..68a1e18f 100644
--- a/debian/libeufin.prerm
+++ b/debian/libeufin-nexus.prerm
@@ -4,7 +4,6 @@ set -e
if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
deb-systemd-invoke stop 'libeufin-nexus.service' >/dev/null || true
- deb-systemd-invoke stop 'libeufin-sandbox.service' >/dev/null || true
fi
if [ -f /usr/share/debconf/confmodule ]; then
@@ -15,7 +14,6 @@ fi
if [ -f /usr/share/dbconfig-common/dpkg/prerm.pgsql ]; then
. /usr/share/dbconfig-common/dpkg/prerm.pgsql
dbc_go libeufin-nexus "$@"
- dbc_go libeufin-sandbox "$@"
fi
diff --git a/debian/libeufin.config b/debian/libeufin-sandbox.config
similarity index 83%
rename from debian/libeufin.config
rename to debian/libeufin-sandbox.config
index c67bd59e..7b870c3c 100644
--- a/debian/libeufin.config
+++ b/debian/libeufin-sandbox.config
@@ -3,9 +3,8 @@
set -e
. /usr/share/debconf/confmodule
-
-_USERNAME=libeufin
-_GROUPNAME=libeufin
+_USERNAME=libeufin-sandbox
+_GROUPNAME=libeufin-sandbox
# For now, we only support postgres
dbc_dbtypes=pgsql
@@ -17,7 +16,6 @@ dbc_authmethod_admin=ident
if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
. /usr/share/dbconfig-common/dpkg/config.pgsql
- dbc_go libeufin-nexus "$@"
dbc_go libeufin-sandbox "$@"
fi
diff --git a/debian/libeufin.install b/debian/libeufin-sandbox.install
similarity index 58%
rename from debian/libeufin.install
rename to debian/libeufin-sandbox.install
index 31347700..37cacd06 100644
--- a/debian/libeufin.install
+++ b/debian/libeufin-sandbox.install
@@ -1,7 +1,7 @@
debian/etc/* etc/
# Files needed by dbconf
-debian/db/install/* usr/share/dbconfig-common/scripts/libeufin/install/
+debian/db/install-sandbox/*
usr/share/dbconfig-common/scripts/libeufin-sandbox/install/
# Install the SPA + JS config:
debian/usr/share/libeufin/* usr/share/libeufin/
diff --git a/debian/libeufin.libeufin-sandbox.service
b/debian/libeufin-sandbox.libeufin-sandbox.service
similarity index 100%
rename from debian/libeufin.libeufin-sandbox.service
rename to debian/libeufin-sandbox.libeufin-sandbox.service
diff --git a/debian/libeufin.postinst b/debian/libeufin-sandbox.postinst
similarity index 72%
rename from debian/libeufin.postinst
rename to debian/libeufin-sandbox.postinst
index d33fce93..2df6a516 100644
--- a/debian/libeufin.postinst
+++ b/debian/libeufin-sandbox.postinst
@@ -7,22 +7,17 @@ if [ -d /run/systemd/system ]; then
fi
if [ "$1" = "remove" ]; then
if [ -x "/usr/bin/deb-systemd-helper" ]; then
- deb-systemd-helper mask 'libeufin-nexus.service' >/dev/null ||
true
deb-systemd-helper mask 'libeufin-sandbox.service' >/dev/null
|| true
fi
fi
if [ "$1" = "purge" ]; then
if [ -x "/usr/bin/deb-systemd-helper" ]; then
- deb-systemd-helper purge 'libeufin-nexus.service' >/dev/null
|| true
deb-systemd-helper purge 'libeufin-sandbox.service' >/dev/null
|| true
- deb-systemd-helper unmask 'libeufin-nexus.service' >/dev/null
|| true
deb-systemd-helper unmask 'libeufin-sandbox.service'
>/dev/null || true
fi
fi
-nexus_user=libeufin-nexus
sandbox_user=libeufin-sandbox
-nexus_group=libeufin-nexus
sandbox_group=libeufin-sandbox
libeufin_home=/var/lib/libeufin
@@ -37,19 +32,10 @@ dbc_first_version="0.9.2"
case "${1}" in
configure)
- if ! getent group $nexus_group >/dev/null; then
- addgroup --quiet --system $nexus_group
- fi
-
if ! getent group $sandbox_group >/dev/null; then
addgroup --quiet --system $sandbox_group
fi
- # Create users if needed
- if ! getent passwd $nexus_user >/dev/null; then
- adduser --quiet --system --no-create-home --ingroup $nexus_group --home
$libeufin_home $nexus_user
- fi
-
# Create users if needed
if ! getent passwd $sandbox_user >/dev/null; then
adduser --quiet --system --no-create-home --ingroup $sandbox_group
--home $libeufin_home $sandbox_user
@@ -59,7 +45,6 @@ case "${1}" in
if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then
. /usr/share/dbconfig-common/dpkg/postinst.pgsql
dbc_pgsql_createdb_encoding="UTF8"
- dbc_go libeufin-nexus "$@"
dbc_go libeufin-sandbox "$@"
fi
diff --git a/debian/libeufin.postrm b/debian/libeufin-sandbox.postrm
similarity index 94%
rename from debian/libeufin.postrm
rename to debian/libeufin-sandbox.postrm
index d2564ea3..6cf72202 100644
--- a/debian/libeufin.postrm
+++ b/debian/libeufin-sandbox.postrm
@@ -8,7 +8,6 @@ fi
if [ -f /usr/share/dbconfig-common/dpkg/postrm.pgsql ]; then
. /usr/share/dbconfig-common/dpkg/postrm.pgsql
- dbc_go libeufin-nexus "$@"
dbc_go libeufin-sandbox "$@"
fi
diff --git a/debian/libeufin.prerm b/debian/libeufin-sandbox.prerm
similarity index 80%
rename from debian/libeufin.prerm
rename to debian/libeufin-sandbox.prerm
index 99106a6e..ed430c4a 100644
--- a/debian/libeufin.prerm
+++ b/debian/libeufin-sandbox.prerm
@@ -3,7 +3,6 @@
set -e
if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
- deb-systemd-invoke stop 'libeufin-nexus.service' >/dev/null || true
deb-systemd-invoke stop 'libeufin-sandbox.service' >/dev/null || true
fi
@@ -14,7 +13,6 @@ fi
if [ -f /usr/share/dbconfig-common/dpkg/prerm.pgsql ]; then
. /usr/share/dbconfig-common/dpkg/prerm.pgsql
- dbc_go libeufin-nexus "$@"
dbc_go libeufin-sandbox "$@"
fi
diff --git a/debian/libeufin.tmpfiles b/debian/libeufin.tmpfiles
deleted file mode 100644
index 433bde6d..00000000
--- a/debian/libeufin.tmpfiles
+++ /dev/null
@@ -1,3 +0,0 @@
-#Type Path Mode UID GID Age Argument
-d /var/lib/libeufin/sandbox 0700 libeufin-sandbox libeufin-sandbox - -
-d /var/lib/libeufin/nexus 0700 libeufin-nexus libeufin-nexus - -
diff --git a/debian/rules b/debian/rules
index 34809f47..45b42bc7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,12 +43,26 @@ override_dh_install:
dh_install
# Needs to be called manually for debhelper-compat < 13
dh_installtmpfiles
+# Reorganize files
+ mkdir -p debian/libeufin-nexus/usr/share/libeufin/lib/
+ mv debian/libeufin-common/usr/share/libeufin/lib/nexus-*.jar \
+ debian/libeufin-nexus/usr/share/libeufin/lib/
+ mkdir -p debian/libeufin-nexus/usr/bin/
+ mv debian/libeufin-common/usr/bin/libeufin-nexus \
+ debian/libeufin-nexus/usr/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/
+ rm -rf debian/libeufin/
override_dh_installsystemd:
# Need to specify units manually, since we have multiple
# and dh_installsystemd by default only looks for "<package>.service".
- dh_installsystemd -plibeufin --name=libeufin-nexus --no-start
--no-enable
- dh_installsystemd -plibeufin --name=libeufin-sandbox --no-start
--no-enable
+ dh_installsystemd -plibeufin-nexus --name=libeufin-nexus --no-start
--no-enable
+ dh_installsystemd -plibeufin-sandbox --name=libeufin-sandbox --no-start
--no-enable
# final invocation to generate daemon reload
dh_installsystemd
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libeufin] branch master updated: split libeufin package,
gnunet <=