diff options
author | psyc://loupsycedyglgamf.onion/~lynX <ircs://psyced.org/youbroketheinternet> | 2018-06-23 13:30:03 +0000 |
---|---|---|
committer | psyc://loupsycedyglgamf.onion/~lynX <ircs://psyced.org/youbroketheinternet> | 2018-06-23 13:30:03 +0000 |
commit | af8cf3fa1402728e46b648d44739ee379fb7f81d (patch) | |
tree | 96fbc73b4bf348e4de4359ea9610c7add318ec00 | |
parent | e5daa4634f5fb7e22ed07c882e224b65c3d78ada (diff) | |
download | gnunet-af8cf3fa1402728e46b648d44739ee379fb7f81d.tar.gz gnunet-af8cf3fa1402728e46b648d44739ee379fb7f81d.zip |
rename USER_SERVICE into RUN_PER_USER. thx, tg (#4548a)
-rw-r--r-- | doc/man/gnunet.conf.5 | 2 | ||||
-rw-r--r-- | src/arm/gnunet-service-arm.c | 4 | ||||
-rw-r--r-- | src/credential/credential.conf.in | 4 | ||||
-rw-r--r-- | src/gns/gns.conf.in | 4 | ||||
-rw-r--r-- | src/identity-provider/identity-provider.conf | 2 | ||||
-rw-r--r-- | src/identity/identity.conf.in | 2 | ||||
-rw-r--r-- | src/namecache/namecache.conf.in | 2 | ||||
-rw-r--r-- | src/namestore/namestore.conf.in | 2 | ||||
-rw-r--r-- | src/social/social.conf.in | 2 | ||||
-rw-r--r-- | 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: | |||
88 | .IP UNIX_MATCH_GID | 88 | .IP UNIX_MATCH_GID |
89 | If UNIX domain sockets are used, set this to YES if only users with the same | 89 | If UNIX domain sockets are used, set this to YES if only users with the same |
90 | GID are allowed to access the service. | 90 | GID are allowed to access the service. |
91 | .IP USER_SERVICE | 91 | .IP RUN_PER_USER |
92 | Set to YES if this service should be run per-user, NO if this is a system | 92 | Set to YES if this service should be run per-user, NO if this is a system |
93 | service. End-users should never have to change the defaults GNUnet provides | 93 | service. End-users should never have to change the defaults GNUnet provides |
94 | for this option. | 94 | 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, | |||
1990 | if ((GNUNET_YES == | 1990 | if ((GNUNET_YES == |
1991 | GNUNET_CONFIGURATION_have_value (cfg, | 1991 | GNUNET_CONFIGURATION_have_value (cfg, |
1992 | section, | 1992 | section, |
1993 | "USER_SERVICE")) && | 1993 | "RUN_PER_USER")) && |
1994 | (GNUNET_YES == | 1994 | (GNUNET_YES == |
1995 | GNUNET_CONFIGURATION_get_value_yesno (cfg, | 1995 | GNUNET_CONFIGURATION_get_value_yesno (cfg, |
1996 | section, | 1996 | section, |
1997 | "USER_SERVICE"))) | 1997 | "RUN_PER_USER"))) |
1998 | { | 1998 | { |
1999 | if (GNUNET_NO == start_user) | 1999 | if (GNUNET_NO == start_user) |
2000 | { | 2000 | { |
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 @@ | |||
1 | [credential] | 1 | [credential] |
2 | BINARY = gnunet-service-credential | 2 | BINARY = gnunet-service-credential |
3 | UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-credential.sock | 3 | UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-credential.sock |
4 | USER_SERVICE = YES | 4 | RUN_PER_USER = YES |
5 | OPTIONS = -L DEBUG \ No newline at end of file | 5 | 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 | |||
31 | [gns-proxy] | 31 | [gns-proxy] |
32 | BINARY = gnunet-gns-proxy | 32 | BINARY = gnunet-gns-proxy |
33 | AUTOSTART = NO | 33 | AUTOSTART = NO |
34 | USER_SERVICE = YES | 34 | RUN_PER_USER = YES |
35 | 35 | ||
36 | # Where is the certificate for the GNS proxy stored? | 36 | # Where is the certificate for the GNS proxy stored? |
37 | PROXY_CACERT = $GNUNET_DATA_HOME/gns/gns_ca_cert.pem | 37 | PROXY_CACERT = $GNUNET_DATA_HOME/gns/gns_ca_cert.pem |
@@ -41,7 +41,7 @@ PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock | |||
41 | [dns2gns] | 41 | [dns2gns] |
42 | BINARY = gnunet-dns2gns | 42 | BINARY = gnunet-dns2gns |
43 | AUTOSTART = NO | 43 | AUTOSTART = NO |
44 | USER_SERVICE = YES | 44 | RUN_PER_USER = YES |
45 | 45 | ||
46 | # -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use | 46 | # -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use |
47 | OPTIONS = -d 8.8.8.8 | 47 | 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 @@ | |||
1 | [identity-provider] | 1 | [identity-provider] |
2 | AUTOSTART = NO | 2 | AUTOSTART = NO |
3 | USER_SERVICE = YES | 3 | RUN_PER_USER = YES |
4 | #PORT = 2108 | 4 | #PORT = 2108 |
5 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
6 | BINARY = gnunet-service-identity-provider | 6 | 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 @@ | |||
1 | [identity] | 1 | [identity] |
2 | AUTOSTART = @AUTOSTART@ | 2 | AUTOSTART = @AUTOSTART@ |
3 | USER_SERVICE = YES | 3 | RUN_PER_USER = YES |
4 | @JAVAPORT@PORT = 2108 | 4 | @JAVAPORT@PORT = 2108 |
5 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
6 | BINARY = gnunet-service-identity | 6 | 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 @@ | |||
1 | [namecache] | 1 | [namecache] |
2 | AUTOSTART = @AUTOSTART@ | 2 | AUTOSTART = @AUTOSTART@ |
3 | USER_SERVICE = NO | 3 | RUN_PER_USER = NO |
4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock | 4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock |
5 | UNIX_MATCH_UID = NO | 5 | UNIX_MATCH_UID = NO |
6 | UNIX_MATCH_GID = YES | 6 | 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 @@ | |||
1 | [namestore] | 1 | [namestore] |
2 | AUTOSTART = @AUTOSTART@ | 2 | AUTOSTART = @AUTOSTART@ |
3 | USER_SERVICE = YES | 3 | RUN_PER_USER = YES |
4 | UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-namestore.sock | 4 | UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-namestore.sock |
5 | UNIX_MATCH_UID = NO | 5 | UNIX_MATCH_UID = NO |
6 | UNIX_MATCH_GID = YES | 6 | 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 @@ | |||
1 | [social] | 1 | [social] |
2 | AUTOSTART = @AUTOSTART@ | 2 | AUTOSTART = @AUTOSTART@ |
3 | BINARY = gnunet-service-social | 3 | BINARY = gnunet-service-social |
4 | USER_SERVICE = YES | 4 | RUN_PER_USER = YES |
5 | 5 | ||
6 | UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-social.sock | 6 | UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-social.sock |
7 | UNIX_MATCH_UID = YES | 7 | 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/ | |||
25 | 25 | ||
26 | # Runtime data (i.e UNIX domain sockets, locks, always lost on system boot) | 26 | # Runtime data (i.e UNIX domain sockets, locks, always lost on system boot) |
27 | # This is the variable for system-wide services; use GNUNET_USER_RUNTIME_DIR | 27 | # This is the variable for system-wide services; use GNUNET_USER_RUNTIME_DIR |
28 | # for per-user services (where USER_SERVICE=YES is set) | 28 | # for per-user services (where RUN_PER_USER=YES is set) |
29 | # Note that the 'gnunet'/system user must have $TMPDIR/$TMP set to | 29 | # Note that the 'gnunet'/system user must have $TMPDIR/$TMP set to |
30 | # exactly the same values as 'normal' users, otherwise this will fail. | 30 | # exactly the same values as 'normal' users, otherwise this will fail. |
31 | # If $TMPDIR or $TMP are set to different directories for different | 31 | # If $TMPDIR or $TMP are set to different directories for different |