From 7a780ec6ecb93f6d0f10c782ac861eb0a073a182 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 28 Apr 2020 16:08:20 +0200
Subject: [PATCH] systemd user space (systemctl --user) unit file

---
 dist/argeo-node/pom.xml                           | 15 +++++++++++++++
 .../rpm/usr/lib/systemd/user/argeo@.service       | 12 ++++++++++++
 dist/argeo-node/rpm/usr/sbin/argeoctl             |  4 ++--
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 dist/argeo-node/rpm/usr/lib/systemd/user/argeo@.service

diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index 52ffd5a53..bedaa364b 100644
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -142,6 +142,21 @@
 												</source>
 											</sources>
 										</mapping>
+										<mapping>
+											<directory>/usr/lib/systemd/user</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>rpm/usr/lib/systemd/user</location>
+													<includes>
+														<include>*.service</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
 										<mapping>
 											<directory>/usr/sbin</directory>
 											<username>root</username>
diff --git a/dist/argeo-node/rpm/usr/lib/systemd/user/argeo@.service b/dist/argeo-node/rpm/usr/lib/systemd/user/argeo@.service
new file mode 100644
index 000000000..27956e1b6
--- /dev/null
+++ b/dist/argeo-node/rpm/usr/lib/systemd/user/argeo@.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Argeo Node %I
+
+[Service]
+Type=simple
+PIDFile=/var/run/user/%U/%i.pid
+ExecStart=/usr/sbin/argeoctl start %I
+ExecReload=/usr/sbin/argeoctl reload %I
+SuccessExitStatus=143
+StateDirectory=argeo.d/%I
+LogsDirectory=argeo.d/%I
+ConfigurationDirectory=argeo.d/%I
diff --git a/dist/argeo-node/rpm/usr/sbin/argeoctl b/dist/argeo-node/rpm/usr/sbin/argeoctl
index 727ef27f4..67b08ebcd 100755
--- a/dist/argeo-node/rpm/usr/sbin/argeoctl
+++ b/dist/argeo-node/rpm/usr/sbin/argeoctl
@@ -9,13 +9,13 @@ else
 # Instance
 INSTANCE=$2
 	if [ -z "$STATE_DIRECTORY" ]; then
-	INSTANCE_DIR=/var/lib/$APP.d/$INSTANCE
+	INSTANCE_DIR=$HOME/.local/share/$APP.d/$INSTANCE
 	else
 	# systemd StateDirectory=
 	INSTANCE_DIR=$STATE_DIRECTORY
 	fi
 	if [ -z "$CONFIGURATION_DIRECTORY" ]; then
-	CONF_DIR=/etc/$APP.d/$INSTANCE
+	CONF_DIR=$HOME/.config/$APP.d/$INSTANCE
 	else
 	# systemd ConfigurationDirectory=
 	CONF_DIR=$CONFIGURATION_DIRECTORY
-- 
2.30.2