[libeufin] branch master updated: debian: config and services

[gnunet]

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

dold pushed a commit to branch master
in repository libeufin.

The following commit(s) were added to refs/heads/master by this push:
     new 0823424  debian: config and services
0823424 is described below

commit 08234249cc25e75c044af52aa94d6adc1cb520e7
Author: Florian Dold <florian@dold.me>
AuthorDate: Fri Jul 30 16:28:14 2021 +0200

    debian: config and services
---
 debian/control                                     |  2 +-
 debian/etc/libeufin/nexus.env                      |  5 +++++
 debian/etc/libeufin/sandbox.env                    |  5 +++++
 debian/libeufin.install                            |  1 +
 ...xus.service => libeufin.libeufin-nexus.service} |  4 ++--
 ...x.service => libeufin.libeufin-sandbox.service} |  4 ++--
 debian/libeufin.postinst                           | 26 +++++++++++++++++++++-
 debian/libeufin.tmpfiles                           |  3 +++
 debian/libeufinenv.conf                            |  5 -----
 debian/rules                                       |  9 ++++++++
 10 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 845ffd4..b6966a0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: libeufin
-Section: networking
+Section: net
 Priority: optional
 Maintainer: Taler Systems SA <deb@taler.net>
 Uploaders: Christian Grothoff <grothoff@gnu.org>, Florian Dold <dold@taler.net>
diff --git a/debian/etc/libeufin/nexus.env b/debian/etc/libeufin/nexus.env
new file mode 100644
index 0000000..85ea07d
--- /dev/null
+++ b/debian/etc/libeufin/nexus.env
@@ -0,0 +1,5 @@
+# Configuration settings for LibEuFin nexus.
+# These settings will be passed as environment variables.
+
+LIBEUFIN_NEXUS_PORT=5017
+LIBEUFIN_NEXUS_DB_CONNECTION=jdbc:sqlite:/var/lib/libeufin/nexus/nexus-db.sqlite3
diff --git a/debian/etc/libeufin/sandbox.env b/debian/etc/libeufin/sandbox.env
new file mode 100644
index 0000000..f311b15
--- /dev/null
+++ b/debian/etc/libeufin/sandbox.env
@@ -0,0 +1,5 @@
+# Configuration settings for the LibEuFin sandbox.
+# These settings will be passed as environment variables.
+
+LIBEUFIN_SANDBOX_PORT=5016
+LIBEUFIN_SANDBOX_DB_CONNECTION=jdbc:sqlite:/var/lib/libeufin/sandbox/sandbox-db.sqlite3
diff --git a/debian/libeufin.install b/debian/libeufin.install
new file mode 100644
index 0000000..708dd6d
--- /dev/null
+++ b/debian/libeufin.install
@@ -0,0 +1 @@
+debian/etc/* etc/
diff --git a/debian/nexus.service b/debian/libeufin.libeufin-nexus.service
similarity index 76%
rename from debian/nexus.service
rename to debian/libeufin.libeufin-nexus.service
index 46d9942..024b7d0 100644
--- a/debian/nexus.service
+++ b/debian/libeufin.libeufin-nexus.service
@@ -2,10 +2,10 @@
 Description=LibEuFin Nexus service.
 
 [Service]
-User=libeufin
+User=libeufin-nexus
+EnvironmentFile=/etc/libeufin/nexus.env
 ExecStart=/usr/bin/libeufin-nexus serve --port=${LIBEUFIN_NEXUS_PORT}
 Restart=on-failure
-EnvironmentFile=/etc/libeufin/libeufinenv.conf
 SuccessExitStatus=143
 
 [Install]
diff --git a/debian/sandbox.service b/debian/libeufin.libeufin-sandbox.service
similarity index 76%
rename from debian/sandbox.service
rename to debian/libeufin.libeufin-sandbox.service
index ce4a04c..0024d34 100644
--- a/debian/sandbox.service
+++ b/debian/libeufin.libeufin-sandbox.service
@@ -2,8 +2,8 @@
 Description=LibEuFin Sandbox service.
 
 [Service]
-EnvironmentFile=/etc/libeufin/libeufinenv.conf
-User=libeufin
+EnvironmentFile=/etc/libeufin/sandbox.env
+User=libeufin-sandbox
 ExecStart=/usr/bin/libeufin-sandbox serve --port=${LIBEUFIN_SANDBOX_PORT}
 Restart=on-failure
 SuccessExitStatus=143
diff --git a/debian/libeufin.postinst b/debian/libeufin.postinst
index 282ce83..efe57b5 100644
--- a/debian/libeufin.postinst
+++ b/debian/libeufin.postinst
@@ -2,9 +2,33 @@
 
 set -e
 
+nexus_user=libeufin-nexus
+sandbox_user=libeufin-sandbox
+nexus_group=libeufin-nexus
+sandbox_group=libeufin-sandbox
+libeufin_home=/var/lib/libeufin
+
 case "${1}" in
   configure)
-    if ! id libeufin &> /dev/null; then useradd --no-create-home --system 
libeufin; fi
+
+    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 $nexus_user >/dev/null; then
+      adduser --quiet --system --no-create-home --ingroup $sandbox_group 
--home $libeufin_home $sandbox_user
+    fi
+
     ;;
 
   abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/libeufin.tmpfiles b/debian/libeufin.tmpfiles
new file mode 100644
index 0000000..433bde6
--- /dev/null
+++ b/debian/libeufin.tmpfiles
@@ -0,0 +1,3 @@
+#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/libeufinenv.conf b/debian/libeufinenv.conf
deleted file mode 100644
index ee95adf..0000000
--- a/debian/libeufinenv.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBEUFIN_SANDBOX_PORT=5016
-LIBEUFIN_NEXUS_PORT=5017
-
-LIBEUFIN_SANDBOX_DB_CONNECTION=jdbc:sqlite:/tmp/libeufindb
-LIBEUFIN_NEXUS_DB_CONNECTION=jdbc:sqlite:/tmp/libeufindb
diff --git a/debian/rules b/debian/rules
index d552c47..b542ca5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,5 +39,14 @@ binary-indep:
 override_dh_strip_nondeterminism:
        true
 
+
+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
+       # final invocation to generate daemon reload
+       dh_installsystemd
+
 get-orig-source:
        uscan --force-download --rename

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