X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Farm%2Farm.conf.in;h=20d3e1dc0bb9ae7fef67d9a2dbfbebe190d28d2c;hb=688f62f7a0fcfc85a3bf611ff855edff541dc52a;hp=e7620b8ff1d8dea7959e69970fa98ba1eab77ee3;hpb=886d774fd210307b4330931285d71279ecaa26cf;p=oweals%2Fgnunet.git

diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index e7620b8ff..20d3e1dc0 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -1,13 +1,12 @@
-
 [arm]
 @UNIXONLY@ PORT = 2087
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist dht nse mesh fs
-UNIXPATH = /tmp/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
 
@@ -16,8 +15,35 @@ UNIX_MATCH_GID = YES
 # service.  Thus the following option would introduce per-service
 # logging with a new log file each day.  Note that only the last 3
 # log files are preserved.
-# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-%Y-%m-%d.log
-# GLOBAL_PREFIX =
+# GLOBAL_POSTFIX = -l $GNUNET_CACHE_HOME/{}-%Y-%m-%d.log
+GLOBAL_PREFIX = @MONKEYPREFIX@
+
+# If set to YES, ARM will only start services that are marked as
+# system-level services (and we'll expect a second ARM to be
+# run per-user to run user-level services).  Note that in this
+# case you must have manually created a different configuration
+# file with the user where at least this and the USER_ONLY
+# options differ.
+# SYSTEM_ONLY = YES
+
+# If set to YES, ARM will only start services that are marked as
+# per-user services (and we'll expect a system user to run ARM to
+# provide system-level services).  Per-user services enable
+# better personalization and  priviledge separation and in particular
+# 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
+
+
+
+# Name of the user that will be used to provide the service
 # USERNAME =
 # MAXBUF =
 # TIMEOUT =