diff options
author | psyc://loupsycedyglgamf.onion/~lynX <ircs://psyced.org/youbroketheinternet> | 2018-06-23 13:30:02 +0000 |
---|---|---|
committer | psyc://loupsycedyglgamf.onion/~lynX <ircs://psyced.org/youbroketheinternet> | 2018-06-23 13:30:02 +0000 |
commit | e5daa4634f5fb7e22ed07c882e224b65c3d78ada (patch) | |
tree | 4f154fe09791a9103a515b1ab9671f1e08484d47 | |
parent | 92609e8b088bf1dde6b927dc0e3be2e9092f0f87 (diff) | |
download | gnunet-e5daa4634f5fb7e22ed07c882e224b65c3d78ada.tar.gz gnunet-e5daa4634f5fb7e22ed07c882e224b65c3d78ada.zip |
rename USER/SYSTEM_ONLY into START_USER/SYSTEM_SERVICES (#4548)
-rw-r--r-- | contrib/ci/docker/Dockerfile | 2 | ||||
-rw-r--r-- | doc/documentation/chapters/developer.texi | 8 | ||||
-rw-r--r-- | doc/documentation/chapters/user.texi | 8 | ||||
-rw-r--r-- | doc/man/gnunet.conf.5 | 4 | ||||
-rw-r--r-- | src/arm/arm.conf.in | 6 | ||||
-rw-r--r-- | src/arm/gnunet-service-arm.c | 6 | ||||
-rw-r--r-- | src/pt/test_gns_vpn.conf | 4 |
7 files changed, 19 insertions, 19 deletions
diff --git a/contrib/ci/docker/Dockerfile b/contrib/ci/docker/Dockerfile index 42c64eaf3..b9f019c43 100644 --- a/contrib/ci/docker/Dockerfile +++ b/contrib/ci/docker/Dockerfile | |||
@@ -22,7 +22,7 @@ RUN cd /usr/src/gnunet && ./bootstrap && ./configure --enable-experimental --pre | |||
22 | 22 | ||
23 | RUN addgroup gnunetdns && addgroup gnunet && adduser --system --home /var/lib/gnunet gnunet | 23 | RUN addgroup gnunetdns && addgroup gnunet && adduser --system --home /var/lib/gnunet gnunet |
24 | RUN chown gnunet:gnunet /var/lib/gnunet | 24 | RUN chown gnunet:gnunet /var/lib/gnunet |
25 | RUN echo '[arm]\nSYSTEM_ONLY = YES\nUSER_ONLY = NO\n' > /etc/gnunet.conf | 25 | RUN echo '[arm]\nSTART_SYSTEM_SERVICES = YES\nSTART_USER_SERVICES = NO\n' > /etc/gnunet.conf |
26 | 26 | ||
27 | ADD docker-entrypoint.sh . | 27 | ADD docker-entrypoint.sh . |
28 | 28 | ||
diff --git a/doc/documentation/chapters/developer.texi b/doc/documentation/chapters/developer.texi index 10319e7a6..6d85c813f 100644 --- 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: | |||
1362 | 1362 | ||
1363 | @example | 1363 | @example |
1364 | [arm] | 1364 | [arm] |
1365 | SYSTEM_ONLY = YES | 1365 | START_SYSTEM_SERVICES = YES |
1366 | USER_ONLY = NO | 1366 | START_USER_SERVICES = NO |
1367 | @end example | 1367 | @end example |
1368 | 1368 | ||
1369 | @noindent | 1369 | @noindent |
@@ -1409,8 +1409,8 @@ with the lines: | |||
1409 | 1409 | ||
1410 | @example | 1410 | @example |
1411 | [arm] | 1411 | [arm] |
1412 | SYSTEM_ONLY = NO | 1412 | START_SYSTEM_SERVICES = NO |
1413 | USER_ONLY = YES | 1413 | START_USER_SERVICES = YES |
1414 | DEFAULTSERVICES = gns | 1414 | DEFAULTSERVICES = gns |
1415 | @end example | 1415 | @end example |
1416 | 1416 | ||
diff --git a/doc/documentation/chapters/user.texi b/doc/documentation/chapters/user.texi index 07dd781b0..fa742b229 100644 --- a/doc/documentation/chapters/user.texi +++ b/doc/documentation/chapters/user.texi | |||
@@ -3742,8 +3742,8 @@ contain the lines:@ | |||
3742 | 3742 | ||
3743 | @example | 3743 | @example |
3744 | [arm] | 3744 | [arm] |
3745 | SYSTEM_ONLY = YES | 3745 | START_SYSTEM_SERVICES = YES |
3746 | USER_ONLY = NO | 3746 | START_USER_SERVICES = NO |
3747 | @end example | 3747 | @end example |
3748 | 3748 | ||
3749 | @noindent | 3749 | @noindent |
@@ -3771,8 +3771,8 @@ $USER with the lines: | |||
3771 | 3771 | ||
3772 | @example | 3772 | @example |
3773 | [arm] | 3773 | [arm] |
3774 | SYSTEM_ONLY = NO | 3774 | START_SYSTEM_SERVICES = NO |
3775 | USER_ONLY = YES | 3775 | START_USER_SERVICES = YES |
3776 | @end example | 3776 | @end example |
3777 | 3777 | ||
3778 | @noindent | 3778 | @noindent |
diff --git a/doc/man/gnunet.conf.5 b/doc/man/gnunet.conf.5 index 707964579..518a352ce 100644 --- a/doc/man/gnunet.conf.5 +++ b/doc/man/gnunet.conf.5 | |||
@@ -137,8 +137,8 @@ to the actual external address for your usage. | |||
137 | EXTERNAL_ADDRESS = 157.166.249.10 | 137 | EXTERNAL_ADDRESS = 157.166.249.10 |
138 | 138 | ||
139 | [arm] | 139 | [arm] |
140 | SYSTEM_ONLY = YES | 140 | START_SYSTEM_SERVICES = YES |
141 | USER_ONLY = NO | 141 | START_USER_SERVICES = NO |
142 | 142 | ||
143 | .SH FILES | 143 | .SH FILES |
144 | .TP | 144 | .TP |
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in index 38cf4599c..64ae35786 100644 --- a/src/arm/arm.conf.in +++ b/src/arm/arm.conf.in | |||
@@ -22,9 +22,9 @@ GLOBAL_PREFIX = @MONKEYPREFIX@ | |||
22 | # system-level services (and we'll expect a second ARM to be | 22 | # system-level services (and we'll expect a second ARM to be |
23 | # run per-user to run user-level services). Note that in this | 23 | # run per-user to run user-level services). Note that in this |
24 | # case you must have manually created a different configuration | 24 | # case you must have manually created a different configuration |
25 | # file with the user where at least this and the USER_ONLY | 25 | # file with the user where at least this and the START_USER_SERVICES |
26 | # options differ. | 26 | # options differ. |
27 | # SYSTEM_ONLY = YES | 27 | # START_SYSTEM_SERVICES = YES |
28 | 28 | ||
29 | # If set to YES, ARM will only start services that are marked as | 29 | # If set to YES, ARM will only start services that are marked as |
30 | # per-user services (and we'll expect a system user to run ARM to | 30 | # per-user services (and we'll expect a system user to run ARM to |
@@ -39,7 +39,7 @@ GLOBAL_PREFIX = @MONKEYPREFIX@ | |||
39 | # USER ARM instances to some free port (counting down from 2085 should | 39 | # USER ARM instances to some free port (counting down from 2085 should |
40 | # be sane). | 40 | # be sane). |
41 | # | 41 | # |
42 | # USER_ONLY = YES | 42 | # START_USER_SERVICES = YES |
43 | 43 | ||
44 | # File where we should log per-service resource consumption on exit. | 44 | # File where we should log per-service resource consumption on exit. |
45 | # RESOURCE_DIAGNOSTICS = resource.log | 45 | # RESOURCE_DIAGNOSTICS = resource.log |
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 4f443d0a1..22c967a9f 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -2226,15 +2226,15 @@ run (void *cls, | |||
2226 | final_option); | 2226 | final_option); |
2227 | start_user = GNUNET_CONFIGURATION_get_value_yesno (cfg, | 2227 | start_user = GNUNET_CONFIGURATION_get_value_yesno (cfg, |
2228 | "ARM", | 2228 | "ARM", |
2229 | "USER_ONLY"); | 2229 | "START_USER_SERVICES"); |
2230 | start_system = GNUNET_CONFIGURATION_get_value_yesno (cfg, | 2230 | start_system = GNUNET_CONFIGURATION_get_value_yesno (cfg, |
2231 | "ARM", | 2231 | "ARM", |
2232 | "SYSTEM_ONLY"); | 2232 | "START_SYSTEM_SERVICES"); |
2233 | if ( (GNUNET_NO == start_user) && | 2233 | if ( (GNUNET_NO == start_user) && |
2234 | (GNUNET_NO == start_system) ) | 2234 | (GNUNET_NO == start_system) ) |
2235 | { | 2235 | { |
2236 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 2236 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
2237 | "Please configure either USER_ONLY or SYSTEM_ONLY or both.\n"); | 2237 | "Please configure either START_USER_SERVICES or START_SYSTEM_SERVICES or both.\n"); |
2238 | GNUNET_SCHEDULER_shutdown (); | 2238 | GNUNET_SCHEDULER_shutdown (); |
2239 | global_ret = 1; | 2239 | global_ret = 1; |
2240 | return; | 2240 | return; |
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf index c603b7422..7447322d4 100644 --- a/src/pt/test_gns_vpn.conf +++ b/src/pt/test_gns_vpn.conf | |||
@@ -7,8 +7,8 @@ PLUGINS = tcp | |||
7 | [arm] | 7 | [arm] |
8 | PORT = 0 | 8 | PORT = 0 |
9 | ALLOW_SHUTDOWN = YES | 9 | ALLOW_SHUTDOWN = YES |
10 | SYSTEM_ONLY = NO | 10 | START_SYSTEM_SERVICES = NO |
11 | USER_ONLY = NO | 11 | START_USER_SERVICES = NO |
12 | 12 | ||
13 | [exit] | 13 | [exit] |
14 | FORCESTART = YES | 14 | FORCESTART = YES |