[GNUnet-SVN] r31297 - in gnunet/src: arm gns identity namestore util

[gnunet]

Author: grothoff
Date: 2013-12-12 09:40:04 +0100 (Thu, 12 Dec 2013)
New Revision: 31297

Modified:
   gnunet/src/arm/arm.conf.in
   gnunet/src/gns/gns.conf.in
   gnunet/src/identity/identity.conf.in
   gnunet/src/namestore/namestore.conf.in
   gnunet/src/util/util.conf
Log:
-trying to fix #3202

Modified: gnunet/src/arm/arm.conf.in
===================================================================
--- gnunet/src/arm/arm.conf.in  2013-12-12 08:31:25 UTC (rev 31296)
+++ gnunet/src/arm/arm.conf.in  2013-12-12 08:40:04 UTC (rev 31297)
@@ -6,7 +6,8 @@
 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 @@
 # 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
 
 

Modified: gnunet/src/gns/gns.conf.in
===================================================================
--- gnunet/src/gns/gns.conf.in  2013-12-12 08:31:25 UTC (rev 31296)
+++ gnunet/src/gns/gns.conf.in  2013-12-12 08:40:04 UTC (rev 31297)
@@ -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
 @address@hidden = 2102
 
 # Do we require users that want to access GNS to run this process

Modified: gnunet/src/identity/identity.conf.in
===================================================================
--- gnunet/src/identity/identity.conf.in        2013-12-12 08:31:25 UTC (rev 
31296)
+++ gnunet/src/identity/identity.conf.in        2013-12-12 08:40:04 UTC (rev 
31297)
@@ -6,7 +6,7 @@
 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
 

Modified: gnunet/src/namestore/namestore.conf.in
===================================================================
--- gnunet/src/namestore/namestore.conf.in      2013-12-12 08:31:25 UTC (rev 
31296)
+++ gnunet/src/namestore/namestore.conf.in      2013-12-12 08:40:04 UTC (rev 
31297)
@@ -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

Modified: gnunet/src/util/util.conf
===================================================================
--- gnunet/src/util/util.conf   2013-12-12 08:31:25 UTC (rev 31296)
+++ gnunet/src/util/util.conf   2013-12-12 08:40:04 UTC (rev 31297)
@@ -24,8 +24,14 @@
 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/
 # GNUNET_TEST_HOME = /var/lib/gnunet/