rename USER_SERVICE into RUN_PER_USER. thx, tg (#4548a)

diff --git a/doc/man/gnunet.conf.5 b/doc/man/gnunet.conf.5
index 518a352ce341e5bae6a93cfd27eef29dd5f85555..1a94a0a6693c784e67c573c804000edf6e2f9dbf 100644 (file)
--- a/doc/man/gnunet.conf.5
+++ b/doc/man/gnunet.conf.5
@@ -88,7 +88,7 @@ The following options are generic and shared by all services:
 .IP UNIX_MATCH_GID
     If UNIX domain sockets are used, set this to YES if only users with the same
     GID are allowed to access the service.
-.IP USER_SERVICE
+.IP RUN_PER_USER
     Set to YES if this service should be run per-user, NO if this is a system
     service.  End-users should never have to change the defaults GNUnet provides
     for this option.

diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 22c967a9fce4eccdad49ebbcef64dc63938973ff..f7a59c5fb9fe0b084b655f20093997e5aa85f6d7 100644 (file)
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -1990,11 +1990,11 @@ setup_service (void *cls,
   if ((GNUNET_YES ==
        GNUNET_CONFIGURATION_have_value (cfg,
                                         section,
-                                        "USER_SERVICE")) &&
+                                        "RUN_PER_USER")) &&
       (GNUNET_YES ==
        GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                              section,
-                                             "USER_SERVICE")))
+                                             "RUN_PER_USER")))
   {
     if (GNUNET_NO == start_user)
     {

diff --git a/src/credential/credential.conf.in b/src/credential/credential.conf.in
index 71f3066ca9413ad0bd4afefe3348595597a7f18a..d5a0b1c88a3fbdd835a6d72c8571d7020bce6d94 100644 (file)
--- a/src/credential/credential.conf.in
+++ b/src/credential/credential.conf.in
@@ -1,5 +1,5 @@
 [credential]
 BINARY = gnunet-service-credential
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-credential.sock
-USER_SERVICE = YES
-OPTIONS = -L DEBUG
\ No newline at end of file
+RUN_PER_USER = YES
+OPTIONS = -L DEBUG

diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index de50d1047fdf343ce85a8e488ee10adc0743b434..323129a1e652c1435468d1e30a7cb8e20a70e39c 100644 (file)
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -31,7 +31,7 @@ INTERCEPT_DNS = NO
 [gns-proxy]
 BINARY = gnunet-gns-proxy
 AUTOSTART = NO
-USER_SERVICE = YES
+RUN_PER_USER = YES
 
 # Where is the certificate for the GNS proxy stored?
 PROXY_CACERT = $GNUNET_DATA_HOME/gns/gns_ca_cert.pem
@@ -41,7 +41,7 @@ PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
 [dns2gns]
 BINARY = gnunet-dns2gns
 AUTOSTART = NO
-USER_SERVICE = YES
+RUN_PER_USER = YES
 
 # -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use
 OPTIONS = -d 8.8.8.8

diff --git a/src/identity-provider/identity-provider.conf b/src/identity-provider/identity-provider.conf
index f2c24c32d7514615cac781e6e09172b8f262133e..3d4e340a66b164c03c6a0d396933e130d5f294a3 100644 (file)
--- a/src/identity-provider/identity-provider.conf
+++ b/src/identity-provider/identity-provider.conf
@@ -1,6 +1,6 @@
 [identity-provider]
 AUTOSTART = NO
-USER_SERVICE = YES
+RUN_PER_USER = YES
 #PORT = 2108
 HOSTNAME = localhost
 BINARY = gnunet-service-identity-provider

diff --git a/src/identity/identity.conf.in b/src/identity/identity.conf.in
index 4af3a6261ef0874c8ef3b05fa05127a9cda26e5c..32855c02d37448173795e007c26bd35b5a8dacf4 100644 (file)
--- a/src/identity/identity.conf.in
+++ b/src/identity/identity.conf.in
@@ -1,6 +1,6 @@
 [identity]
 AUTOSTART = @AUTOSTART@
-USER_SERVICE = YES
+RUN_PER_USER = YES
 @JAVAPORT@PORT = 2108
 HOSTNAME = localhost
 BINARY = gnunet-service-identity

diff --git a/src/namecache/namecache.conf.in b/src/namecache/namecache.conf.in
index becd34187c3e4aa467b5238a0093f2c5cfadc73d..27062ca82de5bcb226a20e7c6eb2c5df2ca7533e 100644 (file)
--- a/src/namecache/namecache.conf.in
+++ b/src/namecache/namecache.conf.in
@@ -1,6 +1,6 @@
 [namecache]
 AUTOSTART = @AUTOSTART@
-USER_SERVICE = NO
+RUN_PER_USER = NO
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES

diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in
index 8b5e440b87e6065abf762e0404e5d628eaf479b0..94e1586098f62314fc048a71c2f4e599194063df 100644 (file)
--- a/src/namestore/namestore.conf.in
+++ b/src/namestore/namestore.conf.in
@@ -1,6 +1,6 @@
 [namestore]
 AUTOSTART = @AUTOSTART@
-USER_SERVICE = YES
+RUN_PER_USER = YES
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-namestore.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES

diff --git a/src/social/social.conf.in b/src/social/social.conf.in
index 33b14e5b47673421d877c583fd2fa270c2212d4f..7dfa140e645d287f87ae5a9aed1a882d8097d950 100644 (file)
--- a/src/social/social.conf.in
+++ b/src/social/social.conf.in
@@ -1,7 +1,7 @@
 [social]
 AUTOSTART = @AUTOSTART@
 BINARY = gnunet-service-social
-USER_SERVICE = YES
+RUN_PER_USER = YES
 
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-social.sock
 UNIX_MATCH_UID = YES

diff --git a/src/util/util.conf b/src/util/util.conf
index f2e5bee28296437ee19371c2f9bc9a207cdbf6de..dbc2b2e0d69739946f4139c411ad1a1623eda3d0 100644 (file)
--- a/src/util/util.conf
+++ b/src/util/util.conf
@@ -25,7 +25,7 @@ GNUNET_CACHE_HOME = ${XDG_CACHE_HOME:-$GNUNET_HOME/.cache}/gnunet/
 
 # Runtime data (i.e UNIX domain sockets, locks, always lost on system boot)
 # This is the variable for system-wide services; use GNUNET_USER_RUNTIME_DIR
-# for per-user services (where USER_SERVICE=YES is set)
+# for per-user services (where RUN_PER_USER=YES is set)
 # Note that the 'gnunet'/system user must have $TMPDIR/$TMP set to
 # exactly the same values as 'normal' users, otherwise this will fail.
 # If $TMPDIR or $TMP are set to different directories for different