rename USER/SYSTEM_ONLY into START_USER/SYSTEM_SERVICES (#4548)

diff --git a/contrib/ci/docker/Dockerfile b/contrib/ci/docker/Dockerfile
index 42c64eaf32e36fb172f55a463eaa5359aff1f097..b9f019c4392ee2885dec0c0dfd14bebadb1489fd 100644 (file)
--- a/contrib/ci/docker/Dockerfile
+++ b/contrib/ci/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN cd /usr/src/gnunet && ./bootstrap && ./configure --enable-experimental --pre
 
 RUN addgroup gnunetdns && addgroup gnunet && adduser --system --home /var/lib/gnunet gnunet
 RUN chown gnunet:gnunet /var/lib/gnunet
-RUN echo '[arm]\nSYSTEM_ONLY = YES\nUSER_ONLY = NO\n' > /etc/gnunet.conf
+RUN echo '[arm]\nSTART_SYSTEM_SERVICES = YES\nSTART_USER_SERVICES = NO\n' > /etc/gnunet.conf
 
 ADD docker-entrypoint.sh .
 

diff --git a/doc/documentation/chapters/developer.texi b/doc/documentation/chapters/developer.texi
index 10319e7a63e408c55559674f02737bf1bb88141c..6d85c813f8441cfdbb23a2903a6e7ac7f2c2afe6 100644 (file)
--- a/doc/documentation/chapters/developer.texi
+++ b/doc/documentation/chapters/developer.texi
@@ -1362,8 +1362,8 @@ Next, edit the file @file{/etc/gnunet.conf} to contain the following:
 
 @example
 [arm]
-SYSTEM_ONLY = YES
-USER_ONLY = NO
+START_SYSTEM_SERVICES = YES
+START_USER_SERVICES = NO
 @end example
 
 @noindent
@@ -1409,8 +1409,8 @@ with the lines:
 
 @example
 [arm]
-SYSTEM_ONLY = NO
-USER_ONLY = YES
+START_SYSTEM_SERVICES = NO
+START_USER_SERVICES = YES
 DEFAULTSERVICES = gns
 @end example
 

diff --git a/doc/documentation/chapters/user.texi b/doc/documentation/chapters/user.texi
index 07dd781b032fe0e9aa49449c428b87ece193c869..fa742b229c2a48ac364a5f73b271d822735c2788 100644 (file)
--- a/doc/documentation/chapters/user.texi
+++ b/doc/documentation/chapters/user.texi
@@ -3742,8 +3742,8 @@ contain the lines:@
 
 @example
 [arm]
-SYSTEM_ONLY = YES
-USER_ONLY = NO
+START_SYSTEM_SERVICES = YES
+START_USER_SERVICES = NO
 @end example
 
 @noindent
@@ -3771,8 +3771,8 @@ $USER with the lines:
 
 @example
 [arm]
-SYSTEM_ONLY = NO
-USER_ONLY = YES
+START_SYSTEM_SERVICES = NO
+START_USER_SERVICES = YES
 @end example
 
 @noindent

diff --git a/doc/man/gnunet.conf.5 b/doc/man/gnunet.conf.5
index 70796457939843edba6f477f819a651d48690f5c..518a352ce341e5bae6a93cfd27eef29dd5f85555 100644 (file)
--- a/doc/man/gnunet.conf.5
+++ b/doc/man/gnunet.conf.5
@@ -137,8 +137,8 @@ to the actual external address for your usage.
     EXTERNAL_ADDRESS = 157.166.249.10
 
     [arm]
-    SYSTEM_ONLY = YES
-    USER_ONLY = NO
+    START_SYSTEM_SERVICES = YES
+    START_USER_SERVICES = NO
 
 .SH FILES
 .TP

diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index 38cf4599c32da8d0af4e327de946de7c14ffa03e..64ae35786eadbc50fc3578e6054ab10087debdcb 100644 (file)
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -22,9 +22,9 @@ GLOBAL_PREFIX = @MONKEYPREFIX@
 # 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
+# file with the user where at least this and the START_USER_SERVICES
 # options differ.
-# SYSTEM_ONLY = YES
+# START_SYSTEM_SERVICES = 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
@@ -39,7 +39,7 @@ GLOBAL_PREFIX = @MONKEYPREFIX@
 # USER ARM instances to some free port (counting down from 2085 should
 # be sane).
 #
-# USER_ONLY = YES
+# START_USER_SERVICES = YES
 
 # File where we should log per-service resource consumption on exit.
 # RESOURCE_DIAGNOSTICS = resource.log

diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 4f443d0a1335c9796090d7fb47d108350e45ef20..22c967a9fce4eccdad49ebbcef64dc63938973ff 100644 (file)
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -2226,15 +2226,15 @@ run (void *cls,
                                                        final_option);
   start_user = GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                             "ARM",
-                                            "USER_ONLY");
+                                            "START_USER_SERVICES");
   start_system = GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                             "ARM",
-                                            "SYSTEM_ONLY");
+                                            "START_SYSTEM_SERVICES");
   if ( (GNUNET_NO == start_user) && 
        (GNUNET_NO == start_system) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-       "Please configure either USER_ONLY or SYSTEM_ONLY or both.\n");
+       "Please configure either START_USER_SERVICES or START_SYSTEM_SERVICES or both.\n");
     GNUNET_SCHEDULER_shutdown ();
     global_ret = 1;
     return;

diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index c603b7422032632ffc925848f8020a5bc2456b3f..7447322d4bb8868ca2b51f6db9317dd24703f503 100644 (file)
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -7,8 +7,8 @@ PLUGINS = tcp
 [arm]
 PORT = 0
 ALLOW_SHUTDOWN = YES
-SYSTEM_ONLY = NO
-USER_ONLY = NO
+START_SYSTEM_SERVICES = NO
+START_USER_SERVICES = NO
 
 [exit]
 FORCESTART = YES