From 2ac6ceea578d1425454079f6250a344584dba3e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Veyret?= <stephane.veyret@neptura.org>
Date: Wed, 14 Mar 2018 20:47:42 +0100
Subject: [PATCH 1/2] Use same default DUNITER_HOME for OpenRC
Issue #1296
---
release/extra/openrc/duniter.confd | 2 +-
release/extra/openrc/duniter.initd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/release/extra/openrc/duniter.confd b/release/extra/openrc/duniter.confd
index af0c9a3a8..85be4c7ac 100644
--- a/release/extra/openrc/duniter.confd
+++ b/release/extra/openrc/duniter.confd
@@ -13,7 +13,7 @@
#DUNITER_USER=duniter
# Directory of duniter files
-#DUNITER_HOME=/var/lib/duniter
+#DUNITER_HOME=/var/lib/duniter/.config/duniter
# Directory of duniter data
#DUNITER_DATA=duniter_default
diff --git a/release/extra/openrc/duniter.initd b/release/extra/openrc/duniter.initd
index 6ce4c3d19..e6bd7d7d5 100644
--- a/release/extra/openrc/duniter.initd
+++ b/release/extra/openrc/duniter.initd
@@ -3,7 +3,7 @@
: ${DUNITER_GROUP:=duniter}
: ${DUNITER_USER:=duniter}
-: ${DUNITER_HOME:=/var/lib/duniter}
+: ${DUNITER_HOME:=/var/lib/duniter/.config/duniter}
: ${DUNITER_DATA:=duniter_default}
command="/usr/bin/duniter"
--
GitLab
From 6ea8a99479926823e23b68961483635f54aefd8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Veyret?= <sveyret@axway.com>
Date: Sun, 18 Mar 2018 19:21:13 +0100
Subject: [PATCH 2/2] Use OpenRC SSD option at correct place
Issue #1298
---
release/extra/openrc/duniter.initd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/release/extra/openrc/duniter.initd b/release/extra/openrc/duniter.initd
index e6bd7d7d5..ef29b84ee 100644
--- a/release/extra/openrc/duniter.initd
+++ b/release/extra/openrc/duniter.initd
@@ -21,8 +21,8 @@ fi
if [[ ! -z ${DUNITER_KEYS} ]] && [[ -r ${DUNITER_KEYS} ]]; then
command_args="${command_args} --keyfile \"${DUNITER_KEYS}\""
fi
-command_args="${command_args} --home \"${DUNITER_HOME}\" --mdb \"${DUNITER_DATA}\" ${DUNITER_SSD_OPTIONS}"
-start_stop_daemon_args="--user \"${DUNITER_USER}\":\"${DUNITER_GROUP}\""
+command_args="${command_args} --home \"${DUNITER_HOME}\" --mdb \"${DUNITER_DATA}\""
+start_stop_daemon_args="--user \"${DUNITER_USER}\":\"${DUNITER_GROUP}\" ${DUNITER_SSD_OPTIONS}"
description="Duniter node"
depend() {
--
GitLab