-trying to fix #3202

5 files changed, 18 insertions, 5 deletions

diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index 830b51dc1..45c37b0d8 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -6,7 +6,8 @@ BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 DEFAULTSERVICES = topology hostlist dht nse mesh fs
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-arm.sock
+# Special case, uses user runtime dir even for per-system service.
+UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-arm.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
@@ -33,6 +34,12 @@ GLOBAL_PREFIX = @MONKEYPREFIX@
 # ensures that personal data is stored under $HOME, which might
 # be important in a multi-user system (or if $HOME is encrypted
 # and /var/ is not).
+#
+# Note that if you have different ARM services for SYSTEM and USER,
+# and you are not on UNIX, you need to change the PORT option for the
+# USER ARM instances to some free port (counting down from 2085 should
+# be sane).
+#
 # USER_ONLY = YES
 
 
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index e600871fc..25a6f3ab5 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -2,7 +2,7 @@
 AUTOSTART = @AUTOSTART@
 HOSTNAME = localhost
 BINARY = gnunet-service-gns
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-gns.sock
+UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-gns.sock
 @UNIXONLY@PORT = 2102
 
 # Do we require users that want to access GNS to run this process
diff --git a/src/identity/identity.conf.in b/src/identity/identity.conf.in
index 19efd4aa6..9d1bb1a66 100644
--- a/src/identity/identity.conf.in
+++ b/src/identity/identity.conf.in
@@ -6,7 +6,7 @@ HOSTNAME = localhost
 BINARY = gnunet-service-identity
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-identity.unix
+UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-identity.unix
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
 
diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in
index a5fde1a85..efb326b74 100644
--- a/src/namestore/namestore.conf.in
+++ b/src/namestore/namestore.conf.in
@@ -1,7 +1,7 @@
 [namestore]
 AUTOSTART = @AUTOSTART@
 USER_SERVICE = YES
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore.sock
+UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-namestore.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
 @UNIXONLY@ PORT = 2099
diff --git a/src/util/util.conf b/src/util/util.conf
index 1daef76d4..3df538f5d 100644
--- a/src/util/util.conf
+++ b/src/util/util.conf
@@ -24,7 +24,13 @@ GNUNET_CONFIG_HOME = ${XDG_CONFIG_HOME:-$GNUNET_HOME/.config}/gnunet/
 GNUNET_CACHE_HOME = ${XDG_CACHE_HOME:-$GNUNET_HOME/.cache}/gnunet/
 
 # Runtime data (i.e UNIX domain sockets, locks, always lost on system boot)
-GNUNET_RUNTIME_DIR = ${XDG_RUNTIME_DIR:-${TMPDIR:-${TMP:-/tmp}}}/gnunet/
+# This is the variable for system-wide services; use GNUNET_USER_RUNTIME_DIR
+# for per-user services (where USER_SERVICE=YES is set)
+GNUNET_RUNTIME_DIR = ${XDG_RUNTIME_DIR:-${TMPDIR:-${TMP:-/tmp}}}/gnunet-system-runtime/
+
+# Runtime data for per-user services
+GNUNET_USER_RUNTIME_DIR = ${XDG_RUNTIME_DIR:-${TMPDIR:-${TMP:-/tmp}}}/gnunet-${USERHOME:-${USER:-user}}-runtime/
+
 
 # Legacy option...
 # GNUNET_TEST_HOME = ~/.gnunet/