From af8cf3fa1402728e46b648d44739ee379fb7f81d Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Sat, 23 Jun 2018 13:30:03 +0000 Subject: rename USER_SERVICE into RUN_PER_USER. thx, tg (#4548a) --- doc/man/gnunet.conf.5 | 2 +- src/arm/gnunet-service-arm.c | 4 ++-- src/credential/credential.conf.in | 4 ++-- src/gns/gns.conf.in | 4 ++-- src/identity-provider/identity-provider.conf | 2 +- src/identity/identity.conf.in | 2 +- src/namecache/namecache.conf.in | 2 +- src/namestore/namestore.conf.in | 2 +- src/social/social.conf.in | 2 +- src/util/util.conf | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/man/gnunet.conf.5 b/doc/man/gnunet.conf.5 index 518a352ce..1a94a0a66 100644 --- 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 22c967a9f..f7a59c5fb 100644 --- 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 71f3066ca..d5a0b1c88 100644 --- 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 de50d1047..323129a1e 100644 --- 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 f2c24c32d..3d4e340a6 100644 --- 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 4af3a6261..32855c02d 100644 --- 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 becd34187..27062ca82 100644 --- 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 8b5e440b8..94e158609 100644 --- 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 33b14e5b4..7dfa140e6 100644 --- 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 f2e5bee28..dbc2b2e0d 100644 --- 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 -- cgit v1.2.3