From c293f84ea192f361baf720a3979589c0e0881abc Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Sat, 23 Jun 2018 13:30:04 +0000 Subject: AUTOSTART renamed into START_ON_DEMAND (#4547a) --- configure.ac | 19 +++---- contrib/conf/gnunet/no_autostart_above_core.conf | 58 +++++++++++----------- contrib/nse/experiments/infiniband.conf | 32 ++++++------ .../testbed_configs/regex_profiler_infiniband.conf | 22 ++++---- contrib/testbed_configs/testbed_cluster.conf | 28 +++++------ contrib/testbed_configs/testbed_infiniband.conf | 28 +++++------ contrib/testbed_configs/testbed_supermuc.conf | 16 +++--- doc/documentation/chapters/developer.texi | 8 +-- doc/documentation/chapters/user.texi | 4 +- doc/man/gnunet.conf.5 | 2 +- po/vi.po | 3 -- po/zh_CN.po | 3 -- src/arm/gnunet-service-arm.c | 4 +- src/arm/test_arm_api_data.conf | 14 +++--- src/ats/ats.conf.in | 2 +- src/auction/auction.conf | 2 +- src/cadet/cadet.conf.in | 2 +- src/cadet/test_cadet.conf | 16 +++--- src/consensus/consensus.conf.in | 2 +- src/consensus/test_consensus.conf | 6 +-- src/conversation/conversation.conf.in | 2 +- src/core/core.conf.in | 2 +- src/credential/test_credential_lookup.conf | 6 +-- src/datastore/datastore.conf.in | 2 +- src/datastore/test_defaults.conf | 2 +- src/dht/dht.conf.in | 2 +- src/dht/test_dht_2dtorus.conf | 4 +- src/dht/test_dht_api_data.conf | 4 +- src/dht/test_dht_api_peer1.conf | 4 +- src/dht/test_dht_line.conf | 4 +- src/dht/test_dht_monitor.conf | 4 +- src/dht/test_dht_multipeer.conf | 4 +- src/dht/test_dht_tools.conf | 58 +++++++++++----------- src/dns/dns.conf.in | 2 +- src/dv/dv.conf.in | 2 +- src/dv/test_transport_dv_data.conf | 4 +- src/fragmentation/test_fragmentation_data.conf | 2 +- src/fs/fs.conf.in | 2 +- src/gns/gns-helper-service-w32.conf | 2 +- src/gns/gns.conf.in | 6 +-- src/gns/test_gns_lookup.conf | 4 +- src/gns/test_gns_nick_shorten.conf | 4 +- src/gns/test_gns_proxy.conf | 4 +- src/gns/test_gns_simple_lookup.conf | 16 +++--- src/identity-provider/identity-provider.conf | 2 +- src/identity-provider/test_idp.conf | 8 +-- src/identity/identity.conf.in | 2 +- src/integration-tests/confs/c_no_nat_client.conf | 4 +- src/integration-tests/confs/c_no_nat_client_2.conf | 6 +-- src/integration-tests/confs/test_defaults.conf | 8 +-- src/multicast/multicast.conf.in | 2 +- src/multicast/test_multicast.conf | 18 +++---- src/multicast/test_multicast_line.conf | 18 +++---- src/multicast/test_multicast_star.conf | 18 +++---- src/namecache/namecache.conf.in | 2 +- src/namestore/namestore.conf.in | 4 +- src/namestore/test_namestore_api.conf | 6 +-- src/nat-auto/nat-auto.conf.in | 2 +- src/nat/nat.conf.in | 2 +- src/nat/test_nat_test_data.conf | 2 +- src/nse/nse.conf.in | 2 +- src/nse/nse_infiniband.conf | 2 +- src/nse/nse_profiler_test.conf | 4 +- src/peerinfo/peerinfo.conf.in | 2 +- src/peerinfo/test_peerinfo_api_data.conf | 4 +- src/peerstore/peerstore.conf.in | 2 +- src/peerstore/test_peerstore_api_data.conf | 2 +- src/psyc/psyc.conf.in | 2 +- src/psyc/test_psyc.conf | 6 +-- src/psycstore/psycstore.conf.in | 2 +- src/pt/test_gns_vpn.conf | 10 ++-- src/pt/test_gnunet_vpn.conf | 6 +-- src/regex/regex.conf.in | 2 +- src/regex/test_regex_api_data.conf | 4 +- src/revocation/revocation.conf.in | 2 +- src/rps/rps.conf.in | 2 +- src/rps/test_rps.conf | 22 ++++---- src/scalarproduct/scalarproduct.conf.in | 4 +- src/secretsharing/secretsharing.conf.in | 2 +- src/secretsharing/test_secretsharing.conf | 8 +-- src/set/set.conf.in | 2 +- src/set/test_set.conf | 2 +- src/social/social.conf.in | 2 +- src/statistics/statistics.conf.in | 2 +- src/template/template.conf | 2 +- src/testbed-logger/testbed-logger.conf.in | 12 ++--- src/testbed/test_testbed_api_barriers.conf.in | 34 ++++++------- src/testbed/test_testbed_api_statistics.conf | 2 +- src/testbed/test_testbed_api_template.conf | 4 +- src/testbed/test_testbed_underlay.conf.in | 4 +- src/testbed/testbed.conf.in | 10 ++-- src/transport/transport.conf.in | 2 +- src/util/resolver.conf.in | 2 +- src/vpn/vpn.conf.in | 2 +- src/zonemaster/zonemaster.conf.in | 4 +- 95 files changed, 346 insertions(+), 351 deletions(-) diff --git a/configure.ac b/configure.ac index d031b9998..39b78fd3e 100644 --- a/configure.ac +++ b/configure.ac @@ -1377,24 +1377,25 @@ AM_CONDITIONAL([ENABLE_MALICIOUS], [test 1=$malicious]) AC_DEFINE_UNQUOTED([ENABLE_MALICIOUS], [$malicious], [enable compilation of malicious code]) -# should services be started by default when a peer starts? Some services may -# choose to never start by default and it is upto the service/module developer to -# decide it by having "AUTOSTART = NO" instead of "AUTOSTART = @AUTOSTART@" in -# the service/module's conf.in file. -AUTOSTART="YES" -AC_MSG_CHECKING(whether to auto-start peer's services by default) +# should services be started on demand when needed? Some services may choose to +# never start by default and it is up to the service/module developer to decide +# by having "START_ON_DEMAND = NO" instead of "START_ON_DEMAND = @START_ON_DEMAND@" +# in the service/module's conf.in file. +# See also FORCESTART for an unconditional immediate start. +START_ON_DEMAND="YES" +AC_MSG_CHECKING(whether to start peer's services on demand by default) AC_ARG_ENABLE([autostart], [AS_HELP_STRING([--disable-autostart], [do not start peer's services by default])], [enable_autostart=${enableval} if test "x$enable_autostart" == "xno" then - AUTOSTART="NO" + START_ON_DEMAND="NO" fi ], [enable_autostart=yes]) AC_MSG_RESULT($enable_autostart) -#AM_CONDITIONAL([HAVE_AUTOSTART], [test "x$enable_autostart" = "xyes"]) -AC_SUBST(AUTOSTART) +#AM_CONDITIONAL([HAVE_START_ON_DEMAND], [test "x$enable_autostart" = "xyes"]) +AC_SUBST(START_ON_DEMAND) # should memory statistics be kept (very expensive CPU-wise!) AC_MSG_CHECKING(whether to create expensive statistics on memory use) diff --git a/contrib/conf/gnunet/no_autostart_above_core.conf b/contrib/conf/gnunet/no_autostart_above_core.conf index 7bcf6c8ae..114ec83a3 100644 --- a/contrib/conf/gnunet/no_autostart_above_core.conf +++ b/contrib/conf/gnunet/no_autostart_above_core.conf @@ -3,88 +3,88 @@ # (including resolver) [dns] -AUTOSTART = NO +START_ON_DEMAND = NO [dht] -AUTOSTART = NO +START_ON_DEMAND = NO [nse] -AUTOSTART = NO +START_ON_DEMAND = NO [cadet] -AUTOSTART = NO +START_ON_DEMAND = NO [datastore] -AUTOSTART = NO +START_ON_DEMAND = NO [fs] -AUTOSTART = NO +START_ON_DEMAND = NO [dv] -AUTOSTART = NO +START_ON_DEMAND = NO [vpn] -AUTOSTART = NO +START_ON_DEMAND = NO [consensus] -AUTOSTART = NO +START_ON_DEMAND = NO [resolver] -AUTOSTART = NO +START_ON_DEMAND = NO [namestore] -AUTOSTART = NO +START_ON_DEMAND = NO [namecache] -AUTOSTART = NO +START_ON_DEMAND = NO [identity] -AUTOSTART = NO +START_ON_DEMAND = NO [revocation] -AUTOSTART = NO +START_ON_DEMAND = NO [conversation] -AUTOSTART = NO +START_ON_DEMAND = NO [peerstore] -AUTOSTART = NO +START_ON_DEMAND = NO [psycstore] -AUTOSTART = NO +START_ON_DEMAND = NO [gns] -AUTOSTART = NO +START_ON_DEMAND = NO [regex] -AUTOSTART = NO +START_ON_DEMAND = NO [set] -AUTOSTART = NO +START_ON_DEMAND = NO [scalarproduct-bob] -AUTOSTART = NO +START_ON_DEMAND = NO [scalarproduct-alice] -AUTOSTART = NO +START_ON_DEMAND = NO [social] -AUTOSTART = NO +START_ON_DEMAND = NO [psyc] -AUTOSTART = NO +START_ON_DEMAND = NO [rps] -AUTOSTART = NO +START_ON_DEMAND = NO [multicast] -AUTOSTART = NO +START_ON_DEMAND = NO [sensordashboard] -AUTOSTART = NO +START_ON_DEMAND = NO [sensor] -AUTOSTART = NO +START_ON_DEMAND = NO [zonemaster-monitor] -AUTOSTART = NO +START_ON_DEMAND = NO diff --git a/contrib/nse/experiments/infiniband.conf b/contrib/nse/experiments/infiniband.conf index c7b7f2a59..907c1a35e 100644 --- a/contrib/nse/experiments/infiniband.conf +++ b/contrib/nse/experiments/infiniband.conf @@ -2,7 +2,7 @@ SERVICEHOME = $GNUNET_TMP/nse-profiler/ [testbed] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 12113 ACCEPT_FROM = 127.0.0.1;192.168.0.0/16; HOSTNAME = localhost @@ -17,7 +17,7 @@ UNIXPATH = $GNUNET_TMP/test-nse-service-nse.unix BINARY = gnunet-service-nse #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p -AUTOSTART = NO +START_ON_DEMAND = NO # Overriding network settings for faster testing (do NOT use # these values in production just because they are here) WORKDELAY = 60 s @@ -29,17 +29,17 @@ PROOFFILE = $SERVICEHOME/nse.proof UNIXPATH = $GNUNET_TMP/test-nse-service-arm.unix [statistics] -AUTOSTART = YES +START_ON_DEMAND = YES PORT = 12115 [fs] -AUTOSTART = NO +START_ON_DEMAND = NO [datastore] -AUTOSTART = NO +START_ON_DEMAND = NO [dht] -AUTOSTART = NO +START_ON_DEMAND = NO [nat] DISABLEV6 = YES @@ -57,34 +57,34 @@ plugins = udp PORT = 12116 [core] -AUTOSTART = YES +START_ON_DEMAND = YES [peerinfo] -AUTOSTART = YES +START_ON_DEMAND = YES [dns] -AUTOSTART = NO +START_ON_DEMAND = NO [topology] -AUTOSTART = NO +START_ON_DEMAND = NO [dv] -AUTOSTART = NO +START_ON_DEMAND = NO [resolver] -AUTOSTART = YES +START_ON_DEMAND = YES [cadet] -AUTOSTART = NO +START_ON_DEMAND = NO [chat] -AUTOSTART = NO +START_ON_DEMAND = NO [gns] -AUTOSTART = NO +START_ON_DEMAND = NO [vpn] -AUTOSTART = NO +START_ON_DEMAND = NO [nse-profiler] OUTPUT_FILE = nse_output_2000_peers.dat diff --git a/contrib/testbed_configs/regex_profiler_infiniband.conf b/contrib/testbed_configs/regex_profiler_infiniband.conf index 831ee0f76..2a748ac51 100644 --- a/contrib/testbed_configs/regex_profiler_infiniband.conf +++ b/contrib/testbed_configs/regex_profiler_infiniband.conf @@ -1,5 +1,5 @@ [testbed] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 11999 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; HOSTNAME = localhost @@ -13,7 +13,7 @@ BINARY = /home/szengel/gnunet/src/cadet/.libs/gnunet-daemon-regexprofiler REGEX_PREFIX = "GNVPN-0001-PAD" [cadet] -AUTOSTART = YES +START_ON_DEMAND = YES ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; APP_ANNOUNCE_TIME = 240 s ID_ANNOUNCE_TIME = 120 m @@ -22,7 +22,7 @@ PORT = 12001 DHT_REPLICATION_LEVEL = 3 [dht] -AUTOSTART = YES +START_ON_DEMAND = YES ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; HOSTNAME = localhost # Do not allow DHT to create extra connections, beyond those testbed created @@ -41,14 +41,14 @@ DISABLE_BF = YES IN_MEMORY = YES [fs] -AUTOSTART = NO +START_ON_DEMAND = NO [resolver] -AUTOSTART = NO +START_ON_DEMAND = NO HOSTNAME = localhost [transport] -AUTOSTART = YES +START_ON_DEMAND = YES PLUGINS = tcp ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; ACCEPT_FROM6 = ::1; @@ -60,7 +60,7 @@ WAN_QUOTA_OUT = 3932160 WAN_QUOTA_IN = 3932160 [core] -AUTOSTART = YES +START_ON_DEMAND = YES [transport-tcp] TIMEOUT = 300 s @@ -74,7 +74,7 @@ ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; [statistics] PORT = 12008 -AUTOSTART = YES +START_ON_DEMAND = YES ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; DISABLE = NO @@ -89,15 +89,15 @@ PEERGROUP_TIMEOUT = 2400 s SERVICEHOME = $GNUNET_TMP/perf-regex/ [dns] -AUTOSTART = NO +START_ON_DEMAND = NO [nse] -AUTOSTART = YES +START_ON_DEMAND = YES # Minimize proof-of-work CPU consumption by NSE WORKBITS = 1 [vpn] -AUTOSTART = NO +START_ON_DEMAND = NO [nat] # Allow running on systems with only loopback? diff --git a/contrib/testbed_configs/testbed_cluster.conf b/contrib/testbed_configs/testbed_cluster.conf index f92e4d721..62c83ec78 100644 --- a/contrib/testbed_configs/testbed_cluster.conf +++ b/contrib/testbed_configs/testbed_cluster.conf @@ -1,5 +1,5 @@ [testbed] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 12113 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; 10.0.0.0/8; HOSTNAME = localhost @@ -11,22 +11,22 @@ SETUP_TIMEOUT = 30m MAX_OPEN_FDS = 512 [fs] -AUTOSTART = NO +START_ON_DEMAND = NO [resolver] -AUTOSTART = NO +START_ON_DEMAND = NO [cadet] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 71 [dht] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 70 DISABLE_TRY_CONNECT = YES [statistics] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 72 [dhtcache] @@ -42,7 +42,7 @@ NEIGHBOUR_LIMIT = 10 [core] PORT = 12092 -AUTOSTART = YES +START_ON_DEMAND = YES USE_EPHEMERAL_KEYS = NO [arm] @@ -58,28 +58,28 @@ BROADCAST = NO SERVICEHOME = $GNUNET_TMP/test-testbed/ [dns] -AUTOSTART = NO +START_ON_DEMAND = NO [nse] -AUTOSTART = NO +START_ON_DEMAND = NO [vpn] -AUTOSTART = NO +START_ON_DEMAND = NO [nat] RETURN_LOCAL_ADDRESSES = YES [gns] -AUTOSTART = NO +START_ON_DEMAND = NO [peerinfo] NO_IO = YES [consensus] -AUTOSTART = NO +START_ON_DEMAND = NO [dv] -AUTOSTART = NO +START_ON_DEMAND = NO [lockmanager] -AUTOSTART = NO +START_ON_DEMAND = NO diff --git a/contrib/testbed_configs/testbed_infiniband.conf b/contrib/testbed_configs/testbed_infiniband.conf index c87f56eef..812945eea 100644 --- a/contrib/testbed_configs/testbed_infiniband.conf +++ b/contrib/testbed_configs/testbed_infiniband.conf @@ -1,5 +1,5 @@ [testbed] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 12113 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; HOSTNAME = localhost @@ -11,22 +11,22 @@ SETUP_TIMEOUT = 30m MAX_OPEN_FDS = 512 [fs] -AUTOSTART = NO +START_ON_DEMAND = NO [resolver] -AUTOSTART = NO +START_ON_DEMAND = NO [cadet] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 71 [dht] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 70 DISABLE_TRY_CONNECT = YES [statistics] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 72 [dhtcache] @@ -42,7 +42,7 @@ NEIGHBOUR_LIMIT = 10 [core] PORT = 12092 -AUTOSTART = YES +START_ON_DEMAND = YES USE_EPHEMERAL_KEYS = NO [arm] @@ -58,28 +58,28 @@ BROADCAST = NO SERVICEHOME = $GNUNET_TMP/test-testbed/ [dns] -AUTOSTART = NO +START_ON_DEMAND = NO [nse] -AUTOSTART = NO +START_ON_DEMAND = NO [vpn] -AUTOSTART = NO +START_ON_DEMAND = NO [nat] RETURN_LOCAL_ADDRESSES = YES [gns] -AUTOSTART = NO +START_ON_DEMAND = NO [peerinfo] NO_IO = YES [consensus] -AUTOSTART = NO +START_ON_DEMAND = NO [dv] -AUTOSTART = NO +START_ON_DEMAND = NO [lockmanager] -AUTOSTART = NO +START_ON_DEMAND = NO diff --git a/contrib/testbed_configs/testbed_supermuc.conf b/contrib/testbed_configs/testbed_supermuc.conf index 4603b1fe3..47bfee43c 100644 --- a/contrib/testbed_configs/testbed_supermuc.conf +++ b/contrib/testbed_configs/testbed_supermuc.conf @@ -1,5 +1,5 @@ [testbed] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 12113 ACCEPT_FROM = 127.0.0.1;10.0.0.0/8; HOSTNAME = localhost @@ -14,22 +14,22 @@ MAX_OPEN_FDS=512 SETUP_TIMEOUT = 30 m [fs] -AUTOSTART = NO +START_ON_DEMAND = NO [resolver] -AUTOSTART = NO +START_ON_DEMAND = NO [cadet] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 71 [dht] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 70 DISABLE_TRY_CONNECT = YES [statistics] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 72 [dhtcache] @@ -45,7 +45,7 @@ NEIGHBOUR_LIMIT = 10 [core] PORT = 12092 -AUTOSTART = YES +START_ON_DEMAND = YES USE_EPHEMERAL_KEYS = NO [arm] @@ -66,7 +66,7 @@ BEHIND_NAT = NO RETURN_LOCAL_ADDRESSES = NO [peerinfo] -AUTOSTART = NO +START_ON_DEMAND = NO NO_IO = YES [testing] diff --git a/doc/documentation/chapters/developer.texi b/doc/documentation/chapters/developer.texi index 6d85c813f..f4c954509 100644 --- a/doc/documentation/chapters/developer.texi +++ b/doc/documentation/chapters/developer.texi @@ -3702,7 +3702,7 @@ running a service with "valgrind" or "gdb" @item DEBUG Run in debug mode (much verbosity). -@item AUTOSTART ARM will listen to UNIX domain socket and/or TCP port of +@item START_ON_DEMAND ARM will listen to UNIX domain socket and/or TCP port of the service and start the service on-demand. @item FORCESTART ARM will always start this service when the peer @@ -3716,7 +3716,7 @@ is started. Options that impact the operation of ARM overall are in the "[arm]" -section. ARM is a normal service and has (except for AUTOSTART) all of the +section. ARM is a normal service and has (except for START_ON_DEMAND) all of the options that other services do. In addition, ARM has the following options: @@ -8642,11 +8642,11 @@ In the following paragraph the important details are highlighted. Announcing of the regular expressions is done by the gnunet-daemon-regexprofiler, therefore you have to make sure it is -started, by adding it to the AUTOSTART set of ARM: +started, by adding it to the START_ON_DEMAND set of ARM: @example [regexprofiler] -AUTOSTART = YES +START_ON_DEMAND = YES @end example @noindent diff --git a/doc/documentation/chapters/user.texi b/doc/documentation/chapters/user.texi index fa742b229..3b829559b 100644 --- a/doc/documentation/chapters/user.texi +++ b/doc/documentation/chapters/user.texi @@ -2574,7 +2574,7 @@ sqLite, MySQL and Postgres. In order to use GNUnet for file-sharing, you first need to make sure that the file-sharing service is loaded. -This is done by setting the @code{AUTOSTART} option in +This is done by setting the @code{START_ON_DEMAND} option in section @code{[fs]} to "YES". Alternatively, you can run @example @@ -2666,7 +2666,7 @@ The configuration section for the transport service itself is quite similar to all the other services @example -AUTOSTART = YES +START_ON_DEMAND = YES @@UNIXONLY@@ PORT = 2091 HOSTNAME = localhost HOME = $SERVICEHOME diff --git a/doc/man/gnunet.conf.5 b/doc/man/gnunet.conf.5 index 1a94a0a66..b0f1c152c 100644 --- a/doc/man/gnunet.conf.5 +++ b/doc/man/gnunet.conf.5 @@ -59,7 +59,7 @@ The following options are generic and shared by all services: Start the service always when the peer starts. Set to YES for services that should always be launched, even if no other service explicitly needs them. -.IP AUTOSTART +.IP START_ON_DEMAND Set to YES to automatically start the service when it is requested by another service. YES for most GNUnet services. .IP NOARMBIND diff --git a/po/vi.po b/po/vi.po index 9a58b6193..da28c66b4 100644 --- a/po/vi.po +++ b/po/vi.po @@ -11431,9 +11431,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s #~ msgid "Unable to create user account for daemon." #~ msgstr "Không thể tạo tài khoản người dùng cho trình nền." -#~ msgid "Unable to setup autostart for daemon." -#~ msgstr "Không thể thiết lập chức năng tự động khởi chạy cho trình nền." - #~ msgid "Save configuration?" #~ msgstr "Lưu cấu hình không?" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9223350db..80d7e1996 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10275,9 +10275,6 @@ msgstr "" #~ "如果您回答“是”,GNUnet 后台进程将在开机时自动启动。如果您回答“否”,则需要" #~ "在每次使用 GNUnet 时自己启动它。" -#~ msgid "Unable to setup autostart for daemon." -#~ msgstr "无法将守护进程设置为自动启动。" - #~ msgid "Save configuration?" #~ msgstr "保存配置?" diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index f7a59c5fb..a6dccf3de 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c @@ -510,7 +510,7 @@ get_server_addresses (const char *service_name, if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (cfg, service_name, - "AUTOSTART")) + "START_ON_DEMAND")) LOG (GNUNET_ERROR_TYPE_ERROR, _("Have neither PORT nor UNIXPATH for service `%s', but one is required\n"), service_name); @@ -2076,7 +2076,7 @@ setup_service (void *cls, if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_yesno (cfg, section, - "AUTOSTART")) + "START_ON_DEMAND")) return; } if (0 >= (ret = get_server_addresses (section, diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf index b032cc95a..276b313b7 100644 --- a/src/arm/test_arm_api_data.conf +++ b/src/arm/test_arm_api_data.conf @@ -10,12 +10,12 @@ OPTIONS = -L ERROR #PREFIX = valgrind --tool=memcheck --leak-check=yes [resolver] -AUTOSTART = YES +START_ON_DEMAND = YES PORT = 23355 # PREFIX = valgrind [do-nothing] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 2223 HOSTNAME = localhost BINARY = /will/be/overwritten/by/test_exponential_backoff @@ -23,16 +23,16 @@ ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; [statistics] -AUTOSTART = YES +START_ON_DEMAND = YES [core] -AUTOSTART = NO +START_ON_DEMAND = NO [transport] -AUTOSTART = NO +START_ON_DEMAND = NO [ats] -AUTOSTART = NO +START_ON_DEMAND = NO [peerinfo] -AUTOSTART = NO +START_ON_DEMAND = NO diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in index d9e867bde..53c0de0c5 100644 --- a/src/ats/ats.conf.in +++ b/src/ats/ats.conf.in @@ -1,5 +1,5 @@ [ats] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @UNIXONLY@ PORT = 2098 HOSTNAME = localhost BINARY = gnunet-service-ats diff --git a/src/auction/auction.conf b/src/auction/auction.conf index 6ca35896b..deb9ac1fc 100644 --- a/src/auction/auction.conf +++ b/src/auction/auction.conf @@ -1,4 +1,4 @@ [auction] -AUTOSTART = NO +START_ON_DEMAND = NO BINARY = gnunet-service-auction UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-auction.sock diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in index d50e168f0..8e4a8b1cf 100644 --- a/src/cadet/cadet.conf.in +++ b/src/cadet/cadet.conf.in @@ -1,6 +1,6 @@ [cadet] FORCESTART = YES -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @JAVAPORT@PORT = 2096 HOSTNAME = localhost BINARY = gnunet-service-cadet diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf index f2308df29..4731617d4 100644 --- a/src/cadet/test_cadet.conf +++ b/src/cadet/test_cadet.conf @@ -69,32 +69,32 @@ WORKBITS = 0 [hostlist] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [fs] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [vpn] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [revocation] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [gns] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [namestore] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [namecache] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [topology] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO diff --git a/src/consensus/consensus.conf.in b/src/consensus/consensus.conf.in index 2afee04db..b0fbcaf5a 100644 --- a/src/consensus/consensus.conf.in +++ b/src/consensus/consensus.conf.in @@ -1,5 +1,5 @@ [consensus] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @JAVAPORT@PORT = 2103 HOSTNAME = localhost BINARY = gnunet-service-consensus diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf index 6cb0885b0..42e06a66d 100644 --- a/src/consensus/test_consensus.conf +++ b/src/consensus/test_consensus.conf @@ -54,13 +54,13 @@ OPERATION_TIMEOUT = 60 s MAX_OPEN_FDS = 4096 [hostlist] -AUTOSTART = NO +START_ON_DEMAND = NO [fs] -AUTOSTART = NO +START_ON_DEMAND = NO [revocation] -AUTOSTART = NO +START_ON_DEMAND = NO [nat] # Use addresses from the local network interfaces (inluding loopback, but also others) diff --git a/src/conversation/conversation.conf.in b/src/conversation/conversation.conf.in index e966ed6d9..b28fb6e1f 100644 --- a/src/conversation/conversation.conf.in +++ b/src/conversation/conversation.conf.in @@ -1,5 +1,5 @@ [conversation] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ BINARY = gnunet-service-conversation UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-conversation.sock HOSTNAME = localhost diff --git a/src/core/core.conf.in b/src/core/core.conf.in index 3f388632e..2b20a109a 100644 --- a/src/core/core.conf.in +++ b/src/core/core.conf.in @@ -1,5 +1,5 @@ [core] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @JAVAPORT@PORT = 2092 HOSTNAME = localhost BINARY = gnunet-service-core diff --git a/src/credential/test_credential_lookup.conf b/src/credential/test_credential_lookup.conf index bd464a1f4..39f68c944 100644 --- a/src/credential/test_credential_lookup.conf +++ b/src/credential/test_credential_lookup.conf @@ -4,13 +4,13 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-credential-peer-1/ [dht] -AUTOSTART = YES +START_ON_DEMAND = YES [transport] PLUGINS = [credential] -AUTOSTART = YES +START_ON_DEMAND = YES PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/credlog [rest] @@ -18,7 +18,7 @@ PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/r [gns] #PREFIX = valgrind --leak-check=full --track-origins=yes -AUTOSTART = YES +START_ON_DEMAND = YES AUTO_IMPORT_PKEY = YES MAX_PARALLEL_BACKGROUND_QUERIES = 10 DEFAULT_LOOKUP_TIMEOUT = 15 s diff --git a/src/datastore/datastore.conf.in b/src/datastore/datastore.conf.in index 721c865c8..21d24bb52 100644 --- a/src/datastore/datastore.conf.in +++ b/src/datastore/datastore.conf.in @@ -1,5 +1,5 @@ [datastore] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-datastore.sock UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES diff --git a/src/datastore/test_defaults.conf b/src/datastore/test_defaults.conf index 08e630eb0..1f971de8f 100644 --- a/src/datastore/test_defaults.conf +++ b/src/datastore/test_defaults.conf @@ -4,7 +4,7 @@ [datastore] PORT = 22654 QUOTA = 1 MB -AUTOSTART = YES +START_ON_DEMAND = YES [nse] WORKBITS = 1 diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in index f828b725f..9ae6d630b 100644 --- a/src/dht/dht.conf.in +++ b/src/dht/dht.conf.in @@ -1,6 +1,6 @@ [dht] FORCESTART = YES -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @JAVAPORT@PORT = 2095 HOSTNAME = localhost BINARY = gnunet-service-dht diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf index a541e8443..c3621cda5 100644 --- a/src/dht/test_dht_2dtorus.conf +++ b/src/dht/test_dht_2dtorus.conf @@ -4,7 +4,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_2dtorus/ [dht] -AUTOSTART = YES +START_ON_DEMAND = YES FORCESTART = YES [dhtcache] @@ -28,7 +28,7 @@ WAN_QUOTA_OUT = 1 GB OVERLAY_TOPOLOGY = 2D_TORUS [nse] -AUTOSTART = YES +START_ON_DEMAND = YES WORKDELAY = 500 ms INTERVAL = 60 s WORKBITS = 0 diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf index a2c1829c6..3a9857cff 100644 --- a/src/dht/test_dht_api_data.conf +++ b/src/dht/test_dht_api_data.conf @@ -36,9 +36,9 @@ INTERNAL_ADDRESS = 127.0.0.1 EXTERNAL_ADDRESS = 127.0.0.1 [dht] -AUTOSTART = YES +START_ON_DEMAND = YES FORCESTART = YES [nse] -AUTOSTART = YES +START_ON_DEMAND = YES WORKBITS = 1 diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf index b4164077f..64dc243e0 100644 --- a/src/dht/test_dht_api_peer1.conf +++ b/src/dht/test_dht_api_peer1.conf @@ -33,9 +33,9 @@ EXTERNAL_ADDRESS = 127.0.0.1 USE_LOCALADDR = NO [dht] -AUTOSTART = YES +START_ON_DEMAND = YES FORCESTART = YES [nse] -AUTOSTART = YES +START_ON_DEMAND = YES WORKBITS = 1 diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf index 5368b0baf..8e48b1165 100644 --- a/src/dht/test_dht_line.conf +++ b/src/dht/test_dht_line.conf @@ -4,7 +4,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_line/ [dht] -AUTOSTART = YES +START_ON_DEMAND = YES FORCESTART = YES [dhtcache] @@ -32,7 +32,7 @@ OVERLAY_TOPOLOGY = LINE plugins = unix [nse] -AUTOSTART = YES +START_ON_DEMAND = YES WORKDELAY = 500 ms INTERVAL = 60 s WORKBITS = 0 diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf index c0d457e89..26052555e 100644 --- a/src/dht/test_dht_monitor.conf +++ b/src/dht/test_dht_monitor.conf @@ -31,9 +31,9 @@ RETURN_LOCAL_ADDRESSES = YES [dht] -AUTOSTART = YES +START_ON_DEMAND = YES FORCESTART = YES [nse] -AUTOSTART = YES +START_ON_DEMAND = YES WORKBITS = 1 diff --git a/src/dht/test_dht_multipeer.conf b/src/dht/test_dht_multipeer.conf index 4296d783e..725373900 100644 --- a/src/dht/test_dht_multipeer.conf +++ b/src/dht/test_dht_multipeer.conf @@ -2,7 +2,7 @@ @INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf [dht] -AUTOSTART = YES +START_ON_DEMAND = YES FORCESTART = YES [dhtcache] @@ -34,7 +34,7 @@ EXTERNAL_ADDRESS = 127.0.0.1 USE_LOCALADDR = YES [nse] -AUTOSTART = YES +START_ON_DEMAND = YES WORKDELAY = 500 ms INTERVAL = 60 s WORKBITS = 0 diff --git a/src/dht/test_dht_tools.conf b/src/dht/test_dht_tools.conf index 46d206448..f13c9a66a 100644 --- a/src/dht/test_dht_tools.conf +++ b/src/dht/test_dht_tools.conf @@ -30,93 +30,93 @@ EXTERNAL_ADDRESS = 127.0.0.1 USE_LOCALADDR = NO [dht] -AUTOSTART = YES +START_ON_DEMAND = YES FORCESTART = YES [nse] -AUTOSTART = YES +START_ON_DEMAND = YES WORKBITS = 1 # Configuration to disable autostarting of # all services above the 'core' level. # (including resolver) [dns] -AUTOSTART = NO +START_ON_DEMAND = NO [cadet] -AUTOSTART = NO +START_ON_DEMAND = NO [datastore] -AUTOSTART = NO +START_ON_DEMAND = NO [fs] -AUTOSTART = NO +START_ON_DEMAND = NO [dv] -AUTOSTART = NO +START_ON_DEMAND = NO [vpn] -AUTOSTART = NO +START_ON_DEMAND = NO [consensus] -AUTOSTART = NO +START_ON_DEMAND = NO [resolver] -AUTOSTART = NO +START_ON_DEMAND = NO [namestore] -AUTOSTART = NO +START_ON_DEMAND = NO [namecache] -AUTOSTART = NO +START_ON_DEMAND = NO [identity] -AUTOSTART = NO +START_ON_DEMAND = NO [revocation] -AUTOSTART = NO +START_ON_DEMAND = NO [conversation] -AUTOSTART = NO +START_ON_DEMAND = NO [peerstore] -AUTOSTART = NO +START_ON_DEMAND = NO [psycstore] -AUTOSTART = NO +START_ON_DEMAND = NO [gns] -AUTOSTART = NO +START_ON_DEMAND = NO [regex] -AUTOSTART = NO +START_ON_DEMAND = NO [set] -AUTOSTART = NO +START_ON_DEMAND = NO [scalarproduct-bob] -AUTOSTART = NO +START_ON_DEMAND = NO [scalarproduct-alice] -AUTOSTART = NO +START_ON_DEMAND = NO [social] -AUTOSTART = NO +START_ON_DEMAND = NO [psyc] -AUTOSTART = NO +START_ON_DEMAND = NO [rps] -AUTOSTART = NO +START_ON_DEMAND = NO [multicast] -AUTOSTART = NO +START_ON_DEMAND = NO [sensordashboard] -AUTOSTART = NO +START_ON_DEMAND = NO [sensor] -AUTOSTART = NO +START_ON_DEMAND = NO # Configuration file that can be included to prevent ANY of the usual # FORCESTART = YES to be set. Also disables NSE POW calculation. # @@ -154,4 +154,4 @@ FORCESTART = NO FORCESTART = NO [zonemaster] -FORCESTART = NO \ No newline at end of file +FORCESTART = NO diff --git a/src/dns/dns.conf.in b/src/dns/dns.conf.in index 000b73cf1..39f260813 100644 --- a/src/dns/dns.conf.in +++ b/src/dns/dns.conf.in @@ -1,5 +1,5 @@ [dns] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ HOSTNAME = localhost BINARY = gnunet-service-dns UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dns.sock diff --git a/src/dv/dv.conf.in b/src/dv/dv.conf.in index 5d9a960f5..145c58be6 100644 --- a/src/dv/dv.conf.in +++ b/src/dv/dv.conf.in @@ -1,5 +1,5 @@ [dv] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-dv diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf index ff02d4a5e..307921ac4 100644 --- a/src/dv/test_transport_dv_data.conf +++ b/src/dv/test_transport_dv_data.conf @@ -6,11 +6,11 @@ PLUGINS = tcp dv #PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high [dv] -AUTOSTART = YES +START_ON_DEMAND = YES # PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high [set] -AUTOSTART = YES +START_ON_DEMAND = YES # PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high [core] diff --git a/src/fragmentation/test_fragmentation_data.conf b/src/fragmentation/test_fragmentation_data.conf index c236f689c..54ad21ff9 100644 --- a/src/fragmentation/test_fragmentation_data.conf +++ b/src/fragmentation/test_fragmentation_data.conf @@ -1,5 +1,5 @@ [nse] -AUTOSTART = NO +START_ON_DEMAND = NO diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in index d46de387f..7c483a449 100644 --- a/src/fs/fs.conf.in +++ b/src/fs/fs.conf.in @@ -1,5 +1,5 @@ [fs] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ FORCESTART = YES INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst RESPECT = $GNUNET_DATA_HOME/fs/credit/ diff --git a/src/gns/gns-helper-service-w32.conf b/src/gns/gns-helper-service-w32.conf index 48652173a..a7b9fdd70 100644 --- a/src/gns/gns-helper-service-w32.conf +++ b/src/gns/gns-helper-service-w32.conf @@ -1,4 +1,4 @@ [gns-helper-service-w32] -AUTOSTART = YES +START_ON_DEMAND = YES BINARY = gnunet-gns-helper-service-w32 PORT = 5353 diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in index 323129a1e..addfbf14a 100644 --- a/src/gns/gns.conf.in +++ b/src/gns/gns.conf.in @@ -1,5 +1,5 @@ [gns] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ FORCESTART = YES HOSTNAME = localhost BINARY = gnunet-service-gns @@ -30,7 +30,7 @@ INTERCEPT_DNS = NO [gns-proxy] BINARY = gnunet-gns-proxy -AUTOSTART = NO +START_ON_DEMAND = NO RUN_PER_USER = YES # Where is the certificate for the GNS proxy stored? @@ -40,7 +40,7 @@ PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock [dns2gns] BINARY = gnunet-dns2gns -AUTOSTART = NO +START_ON_DEMAND = NO RUN_PER_USER = YES # -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf index a7b842302..0d9d2b49a 100644 --- a/src/gns/test_gns_lookup.conf +++ b/src/gns/test_gns_lookup.conf @@ -4,14 +4,14 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/ [dht] -AUTOSTART = YES +START_ON_DEMAND = YES [transport] PLUGINS = [gns] # PREFIX = valgrind --leak-check=full --track-origins=yes -AUTOSTART = YES +START_ON_DEMAND = YES AUTO_IMPORT_PKEY = YES MAX_PARALLEL_BACKGROUND_QUERIES = 10 DEFAULT_LOOKUP_TIMEOUT = 15 s diff --git a/src/gns/test_gns_nick_shorten.conf b/src/gns/test_gns_nick_shorten.conf index 210159fc8..317477c80 100644 --- a/src/gns/test_gns_nick_shorten.conf +++ b/src/gns/test_gns_nick_shorten.conf @@ -4,14 +4,14 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/ [dht] -AUTOSTART = YES +START_ON_DEMAND = YES [transport] PLUGINS = [gns] #PREFIX = valgrind --leak-check=full --track-origins=yes -AUTOSTART = YES +START_ON_DEMAND = YES AUTO_IMPORT_PKEY = YES MAX_PARALLEL_BACKGROUND_QUERIES = 10 DEFAULT_LOOKUP_TIMEOUT = 15 s diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf index 875c0a5e3..51edd5a0c 100644 --- a/src/gns/test_gns_proxy.conf +++ b/src/gns/test_gns_proxy.conf @@ -13,7 +13,7 @@ WEAKRANDOM = YES HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat [gns] -AUTOSTART = YES +START_ON_DEMAND = YES ZONEKEY = $GNUNET_TEST_HOME/.zonekey HIJACK_DNS = YES @@ -22,7 +22,7 @@ PROXY_CACERT = proxy/test_cert.pem PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock [namestore] -AUTOSTART = YES +START_ON_DEMAND = YES [dns] PROVIDE_EXIT = NO diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf index 5bf6f8e63..374731377 100644 --- a/src/gns/test_gns_simple_lookup.conf +++ b/src/gns/test_gns_simple_lookup.conf @@ -1,13 +1,13 @@ @INLINE@ test_gns_defaults.conf [fs] -AUTOSTART = NO +START_ON_DEMAND = NO [resolver] -AUTOSTART = YES +START_ON_DEMAND = YES HOSTNAME = localhost [dht] -AUTOSTART = YES +START_ON_DEMAND = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; HOSTNAME = localhost @@ -54,12 +54,12 @@ EXTERNAL_ADDRESS = 127.0.0.1 USE_LOCALADDR = NO [dns] -AUTOSTART = YES +START_ON_DEMAND = YES DNS_EXIT = 8.8.8.8 [gns] #PREFIX = valgrind --leak-check=full --track-origins=yes -AUTOSTART = YES +START_ON_DEMAND = YES BINARY = gnunet-service-gns ZONEKEY = zonefiles/test_zonekey PRIVATE_ZONE = private @@ -75,14 +75,14 @@ DEFAULT_LOOKUP_TIMEOUT = 15 s RECORD_PUT_INTERVAL = 1 h [nse] -AUTOSTART = NO +START_ON_DEMAND = NO [statistics] -AUTOSTART = NO +START_ON_DEMAND = NO [namestore] PORT = 22371 -AUTOSTART = YES +START_ON_DEMAND = YES UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore-default.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES diff --git a/src/identity-provider/identity-provider.conf b/src/identity-provider/identity-provider.conf index 3d4e340a6..cc50152a1 100644 --- a/src/identity-provider/identity-provider.conf +++ b/src/identity-provider/identity-provider.conf @@ -1,5 +1,5 @@ [identity-provider] -AUTOSTART = NO +START_ON_DEMAND = NO RUN_PER_USER = YES #PORT = 2108 HOSTNAME = localhost diff --git a/src/identity-provider/test_idp.conf b/src/identity-provider/test_idp.conf index 3559dd767..3e4df561a 100644 --- a/src/identity-provider/test_idp.conf +++ b/src/identity-provider/test_idp.conf @@ -4,22 +4,22 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-idp-peer-1/ [dht] -AUTOSTART = YES +START_ON_DEMAND = YES [rest] -AUTOSTART = YES +START_ON_DEMAND = YES PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/restlog [transport] PLUGINS = [identity-provider] -AUTOSTART = YES +START_ON_DEMAND = YES #PREFIX = valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --log-file=$GNUNET_TMP/idplog [gns] #PREFIX = valgrind --leak-check=full --track-origins=yes -AUTOSTART = YES +START_ON_DEMAND = YES AUTO_IMPORT_PKEY = YES MAX_PARALLEL_BACKGROUND_QUERIES = 10 DEFAULT_LOOKUP_TIMEOUT = 15 s diff --git a/src/identity/identity.conf.in b/src/identity/identity.conf.in index 32855c02d..f5d454323 100644 --- a/src/identity/identity.conf.in +++ b/src/identity/identity.conf.in @@ -1,5 +1,5 @@ [identity] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ RUN_PER_USER = YES @JAVAPORT@PORT = 2108 HOSTNAME = localhost diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf index 26e816267..38a7d7fbc 100644 --- a/src/integration-tests/confs/c_no_nat_client.conf +++ b/src/integration-tests/confs/c_no_nat_client.conf @@ -32,13 +32,13 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18 PORT = 20022 [namestore] -AUTOSTART = YES +START_ON_DEMAND = YES [dns] UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19 [consensus] -AUTOSTART = YES +START_ON_DEMAND = YES [core] UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17 diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf index 0cd6fc4f9..6c8f07632 100644 --- a/src/integration-tests/confs/c_no_nat_client_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_2.conf @@ -33,16 +33,16 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18 PORT = 20022 [namestore] -AUTOSTART = YES +START_ON_DEMAND = YES [dns] UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19 [consensus] -AUTOSTART = YES +START_ON_DEMAND = YES [lockmanager] -AUTOSTART = YES +START_ON_DEMAND = YES [core] UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17 diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf index 39020515f..8114aeabd 100644 --- a/src/integration-tests/confs/test_defaults.conf +++ b/src/integration-tests/confs/test_defaults.conf @@ -5,16 +5,16 @@ FORCESTART = YES [datastore] -AUTOSTART = YES +START_ON_DEMAND = YES [dht] -AUTOSTART = YES +START_ON_DEMAND = YES [nse] -AUTOSTART = YES +START_ON_DEMAND = YES [cadet] -AUTOSTART = YES +START_ON_DEMAND = YES [hostlist] FORCESTART = YES diff --git a/src/multicast/multicast.conf.in b/src/multicast/multicast.conf.in index f4a6daa1e..97a541336 100644 --- a/src/multicast/multicast.conf.in +++ b/src/multicast/multicast.conf.in @@ -1,5 +1,5 @@ [multicast] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ BINARY = gnunet-service-multicast UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock diff --git a/src/multicast/test_multicast.conf b/src/multicast/test_multicast.conf index 1b50e0893..c8c7b4300 100644 --- a/src/multicast/test_multicast.conf +++ b/src/multicast/test_multicast.conf @@ -10,7 +10,7 @@ GLOBAL_POSTFIX=-L ERROR UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock [vpn] -AUTOSTART = NO +START_ON_DEMAND = NO [peerinfo] # Do not use shipped gnunet HELLOs @@ -22,35 +22,35 @@ NO_IO = YES [hostlist] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [nat] ENABLE_UPNP = NO [fs] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [vpn] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [revocation] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [gns] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [namestore] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [namecache] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [topology] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO diff --git a/src/multicast/test_multicast_line.conf b/src/multicast/test_multicast_line.conf index 1047205cb..3535d8399 100644 --- a/src/multicast/test_multicast_line.conf +++ b/src/multicast/test_multicast_line.conf @@ -11,7 +11,7 @@ GLOBAL_POSTFIX=-L ERROR UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock [vpn] -AUTOSTART = NO +START_ON_DEMAND = NO [peerinfo] # Do not use shipped gnunet HELLOs @@ -26,38 +26,38 @@ ID_ANNOUNCE_TIME = 5 s [hostlist] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [nat] ENABLE_UPNP = NO [fs] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [vpn] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [revocation] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [gns] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [namestore] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [namecache] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [topology] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [nse] WORKBITS = 0 diff --git a/src/multicast/test_multicast_star.conf b/src/multicast/test_multicast_star.conf index ed690d95d..f80e36679 100644 --- a/src/multicast/test_multicast_star.conf +++ b/src/multicast/test_multicast_star.conf @@ -11,7 +11,7 @@ GLOBAL_POSTFIX=-L ERROR UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock [vpn] -AUTOSTART = NO +START_ON_DEMAND = NO [peerinfo] # Do not use shipped gnunet HELLOs @@ -26,38 +26,38 @@ ID_ANNOUNCE_TIME = 5 s [hostlist] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [nat] ENABLE_UPNP = NO [fs] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [vpn] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [revocation] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [gns] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [namestore] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [namecache] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [topology] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [nse] WORKBITS = 0 diff --git a/src/namecache/namecache.conf.in b/src/namecache/namecache.conf.in index 27062ca82..cf1340846 100644 --- a/src/namecache/namecache.conf.in +++ b/src/namecache/namecache.conf.in @@ -1,5 +1,5 @@ [namecache] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ RUN_PER_USER = NO UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock UNIX_MATCH_UID = NO diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in index 94e158609..eb95f95be 100644 --- a/src/namestore/namestore.conf.in +++ b/src/namestore/namestore.conf.in @@ -1,5 +1,5 @@ [namestore] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ RUN_PER_USER = YES UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-namestore.sock UNIX_MATCH_UID = NO @@ -42,7 +42,7 @@ gns = gnunet-namestore [fcfsd] # Name of the fcfs registration service binary (for ARM) BINARY = gnunet-namestore-fcfsd -AUTOSTART = NO +START_ON_DEMAND = NO UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-fcfsd.sock # On what port does the FCFS daemon listen for HTTP clients? diff --git a/src/namestore/test_namestore_api.conf b/src/namestore/test_namestore_api.conf index 5e96eab7c..3e75c2ded 100644 --- a/src/namestore/test_namestore_api.conf +++ b/src/namestore/test_namestore_api.conf @@ -6,14 +6,14 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-namestore/ [namestore] DATABASE = sqlite -AUTOSTART = YES +START_ON_DEMAND = YES [namecache] DATABASE = sqlite -AUTOSTART = YES +START_ON_DEMAND = YES [identity] -AUTOSTART = YES +START_ON_DEMAND = YES [nse] WORKBITS = 0 diff --git a/src/nat-auto/nat-auto.conf.in b/src/nat-auto/nat-auto.conf.in index 9461ffcc8..d5f5c4eef 100644 --- a/src/nat-auto/nat-auto.conf.in +++ b/src/nat-auto/nat-auto.conf.in @@ -1,5 +1,5 @@ [nat-auto] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @UNIXONLY@ PORT = 2124 HOSTNAME = localhost BINARY = gnunet-service-nat-auto diff --git a/src/nat/nat.conf.in b/src/nat/nat.conf.in index 87fe29d9c..a8dbee953 100644 --- a/src/nat/nat.conf.in +++ b/src/nat/nat.conf.in @@ -1,5 +1,5 @@ [nat] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @UNIXONLY@ PORT = 2121 HOSTNAME = localhost BINARY = gnunet-service-nat diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf index c0174bf53..84de6159e 100644 --- a/src/nat/test_nat_test_data.conf +++ b/src/nat/test_nat_test_data.conf @@ -42,6 +42,6 @@ DISABLEV6 = YES [nse] -AUTOSTART = NO +START_ON_DEMAND = NO diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in index e8d7bd2ea..7b234451c 100644 --- a/src/nse/nse.conf.in +++ b/src/nse/nse.conf.in @@ -1,5 +1,5 @@ [nse] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ FORCESTART = YES @JAVAPORT@PORT = 2097 HOSTNAME = localhost diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf index 9904ca711..816427bac 100644 --- a/src/nse/nse_infiniband.conf +++ b/src/nse/nse_infiniband.conf @@ -2,7 +2,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/ [testbed] -AUTOSTART = NO +START_ON_DEMAND = NO ORT = 12113 ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 192.168.0.0/16; HOSTNAME = localhost diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf index ad5da536b..4f55fe4a1 100644 --- a/src/nse/nse_profiler_test.conf +++ b/src/nse/nse_profiler_test.conf @@ -2,7 +2,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/ [testbed] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 12113 ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; HOSTNAME = localhost @@ -13,7 +13,7 @@ OPERATION_TIMEOUT = 45 s [nse] FORCESTART = YES -AUTOSTART = NO +START_ON_DEMAND = NO # Overriding network settings for faster testing (do NOT use # these values in production just because they are here) WORKDELAY = 60 s diff --git a/src/peerinfo/peerinfo.conf.in b/src/peerinfo/peerinfo.conf.in index 8615a8866..14a41655b 100644 --- a/src/peerinfo/peerinfo.conf.in +++ b/src/peerinfo/peerinfo.conf.in @@ -1,5 +1,5 @@ [peerinfo] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @JAVAPORT@PORT = 2090 HOSTNAME = localhost BINARY = gnunet-service-peerinfo diff --git a/src/peerinfo/test_peerinfo_api_data.conf b/src/peerinfo/test_peerinfo_api_data.conf index 1522d4dfe..e632c341f 100644 --- a/src/peerinfo/test_peerinfo_api_data.conf +++ b/src/peerinfo/test_peerinfo_api_data.conf @@ -5,11 +5,11 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-peerinfo/ PORT = 22354 [dns] -AUTOSTART = NO +START_ON_DEMAND = NO [nse] -AUTOSTART = NO +START_ON_DEMAND = NO diff --git a/src/peerstore/peerstore.conf.in b/src/peerstore/peerstore.conf.in index a39b61887..a3a7c672b 100644 --- a/src/peerstore/peerstore.conf.in +++ b/src/peerstore/peerstore.conf.in @@ -1,5 +1,5 @@ [peerstore] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @JAVAPORT@PORT = 2110 HOSTNAME = localhost BINARY = gnunet-service-peerstore diff --git a/src/peerstore/test_peerstore_api_data.conf b/src/peerstore/test_peerstore_api_data.conf index 802418fa0..3ebda50eb 100644 --- a/src/peerstore/test_peerstore_api_data.conf +++ b/src/peerstore/test_peerstore_api_data.conf @@ -2,7 +2,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-peerstore [peerstore] -AUTOSTART = YES +START_ON_DEMAND = YES BINARY = gnunet-service-peerstore UNIXPATH = $GNUNET_TMP/gnunet-service-peerstore.sock HOME = $SERVICEHOME diff --git a/src/psyc/psyc.conf.in b/src/psyc/psyc.conf.in index 4a4a96954..764ccfa84 100644 --- a/src/psyc/psyc.conf.in +++ b/src/psyc/psyc.conf.in @@ -1,5 +1,5 @@ [psyc] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ BINARY = gnunet-service-psyc UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psyc.sock diff --git a/src/psyc/test_psyc.conf b/src/psyc/test_psyc.conf index 4e2563a8a..8b2ab9639 100644 --- a/src/psyc/test_psyc.conf +++ b/src/psyc/test_psyc.conf @@ -17,12 +17,12 @@ ENABLE_UPNP = NO [psyc] FORCESTART = YES -AUTOSTART = YES +START_ON_DEMAND = YES [multicast] FORCESTART = YES -AUTOSTART = YES +START_ON_DEMAND = YES [psycstore] FORCESTART = YES -AUTOSTART = YES +START_ON_DEMAND = YES diff --git a/src/psycstore/psycstore.conf.in b/src/psycstore/psycstore.conf.in index 82e9e67c2..3905db173 100644 --- a/src/psycstore/psycstore.conf.in +++ b/src/psycstore/psycstore.conf.in @@ -1,5 +1,5 @@ [psycstore] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ BINARY = gnunet-service-psycstore UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psycstore.sock diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf index 7447322d4..4fd4d8b8a 100644 --- a/src/pt/test_gns_vpn.conf +++ b/src/pt/test_gns_vpn.conf @@ -28,15 +28,15 @@ DNS_EXIT = 8.8.8.8 FORCESTART = YES [identity] -AUTOSTART = YES +START_ON_DEMAND = YES FORCESTART = YES [hostlist] -AUTOSTART = NO +START_ON_DEMAND = NO FORCESTART = NO [zonemaster] -AUTOSTART = YES +START_ON_DEMAND = YES FORCESTART = YES #[vpn] @@ -61,7 +61,7 @@ TCP_REDIRECTS = 80:localhost4:8080 TTL = 3600000 [gns] -AUTOSTART = YES +START_ON_DEMAND = YES ZONEKEY = $GNUNET_TEST_HOME/.zonekey # Delays starting of GNS, as we need to first @@ -69,7 +69,7 @@ ZONEKEY = $GNUNET_TEST_HOME/.zonekey FORCESTART = NO [namestore] -AUTOSTART = YES +START_ON_DEMAND = YES [nat] USE_LOCALADDR = YES diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf index c22cd3409..dfe553784 100644 --- a/src/pt/test_gnunet_vpn.conf +++ b/src/pt/test_gnunet_vpn.conf @@ -21,7 +21,7 @@ IPV4MASK = 255.255.255.0 EXIT_IFNAME = eth1 [hostlist] -AUTOSTART = NO +START_ON_DEMAND = NO FORCESTART = NO [nse] @@ -38,11 +38,11 @@ IPV4MASK = 255.255.255.0 [gns] -AUTOSTART = NO +START_ON_DEMAND = NO [nat] USE_LOCALADDR = YES RETURN_LOCAL_ADDRESSES = YES [consensus] -AUTOSTART = NO +START_ON_DEMAND = NO diff --git a/src/regex/regex.conf.in b/src/regex/regex.conf.in index 8a75881f9..5e68a43da 100644 --- a/src/regex/regex.conf.in +++ b/src/regex/regex.conf.in @@ -1,5 +1,5 @@ [regex] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @UNIXONLY@ PORT = 2107 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-regex.sock HOSTNAME = localhost diff --git a/src/regex/test_regex_api_data.conf b/src/regex/test_regex_api_data.conf index 60dcdc0b6..40fee1e54 100644 --- a/src/regex/test_regex_api_data.conf +++ b/src/regex/test_regex_api_data.conf @@ -19,11 +19,11 @@ WAN_QUOTA_IN = 1 GB WAN_QUOTA_OUT = 1 GB [dht] -AUTOSTART = YES +START_ON_DEMAND = YES PORT = 12370 [regex] -AUTOSTART = YES +START_ON_DEMAND = YES [transport] plugins = tcp diff --git a/src/revocation/revocation.conf.in b/src/revocation/revocation.conf.in index 333f2e488..fe2318286 100644 --- a/src/revocation/revocation.conf.in +++ b/src/revocation/revocation.conf.in @@ -1,5 +1,5 @@ [revocation] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ FORCESTART = YES @JAVAPORT@PORT = 2112 HOSTNAME = localhost diff --git a/src/rps/rps.conf.in b/src/rps/rps.conf.in index 733b72601..7f0a419bd 100644 --- a/src/rps/rps.conf.in +++ b/src/rps/rps.conf.in @@ -1,5 +1,5 @@ [rps] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ BINARY = gnunet-service-rps UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-rps.sock HOME = $SERVICEHOME diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf index e4ed111e2..3d856c693 100644 --- a/src/rps/test_rps.conf +++ b/src/rps/test_rps.conf @@ -6,7 +6,7 @@ HOME = $SERVICEHOME # PORT = 2106 #@UNIXONLY@ PORT = 2087 FORCESTART = YES -AUTOSTART = NO +START_ON_DEMAND = NO NOARMBIND = YES #OPTIONS=-l /tmp/rps_profiler_logs/rps-[]-%Y-%m-%d.log @@ -81,43 +81,43 @@ DISABLE_TRY_CONNECT = YES #[statistics] #FORCESTART = NO -#AUTOSTART = NO +#START_ON_DEMAND = NO [peerinfo] NO_IO = YES [hostlist] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [zonemaster] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [namecache] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [namestore] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [topology] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [vpn] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [revocation] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [gns] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO [fs] FORCESTART = NO -AUTOSTART = NO +START_ON_DEMAND = NO diff --git a/src/scalarproduct/scalarproduct.conf.in b/src/scalarproduct/scalarproduct.conf.in index e2a0c7ad7..e2286b076 100644 --- a/src/scalarproduct/scalarproduct.conf.in +++ b/src/scalarproduct/scalarproduct.conf.in @@ -1,5 +1,5 @@ [scalarproduct-alice] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ BINARY = gnunet-service-scalarproduct-ecc-alice UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-scalarproduct-alice.sock @UNIXONLY@ PORT = 2117 @@ -12,7 +12,7 @@ UNIX_MATCH_GID = YES [scalarproduct-bob] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ HOSTNAME = localhost BINARY = gnunet-service-scalarproduct-ecc-bob UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-scalarproduct-bob.sock diff --git a/src/secretsharing/secretsharing.conf.in b/src/secretsharing/secretsharing.conf.in index 0834235d4..bd8da6177 100644 --- a/src/secretsharing/secretsharing.conf.in +++ b/src/secretsharing/secretsharing.conf.in @@ -1,5 +1,5 @@ [secretsharing] -AUTOSTART = NO +START_ON_DEMAND = NO @JAVAPORT@PORT = 2114 HOSTNAME = localhost BINARY = gnunet-service-secretsharing diff --git a/src/secretsharing/test_secretsharing.conf b/src/secretsharing/test_secretsharing.conf index 9980666cd..3391c88db 100644 --- a/src/secretsharing/test_secretsharing.conf +++ b/src/secretsharing/test_secretsharing.conf @@ -1,10 +1,10 @@ [secretsharing] -AUTOSTART = YES +START_ON_DEMAND = YES #PREFIX = valgrind --leak-check=full OPTIONS = -LINFO [consensus] -AUTOSTART = YES +START_ON_DEMAND = YES [transport] OPTIONS = -LERROR @@ -12,7 +12,7 @@ PLUGINS = unix [set] OPTIONS = -L INFO -AUTOSTART = YES +START_ON_DEMAND = YES #PREFIX = valgrind --leak-check=full [testbed] @@ -32,5 +32,5 @@ DISABLEV6 = NO RETURN_LOCAL_ADDRESSES = YES [nse] -AUTOSTART = NO +START_ON_DEMAND = NO diff --git a/src/set/set.conf.in b/src/set/set.conf.in index deaa07efb..66bcfa169 100644 --- a/src/set/set.conf.in +++ b/src/set/set.conf.in @@ -1,5 +1,5 @@ [set] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @UNIXONLY@PORT = 2106 HOSTNAME = localhost BINARY = gnunet-service-set diff --git a/src/set/test_set.conf b/src/set/test_set.conf index 02afd2ec5..21fe984f8 100644 --- a/src/set/test_set.conf +++ b/src/set/test_set.conf @@ -4,7 +4,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-set/ [set] -AUTOSTART = YES +START_ON_DEMAND = YES #PREFIX = valgrind --leak-check=full #PREFIX = gdbserver :1234 OPTIONS = -L INFO diff --git a/src/social/social.conf.in b/src/social/social.conf.in index 7dfa140e6..3fe754c80 100644 --- a/src/social/social.conf.in +++ b/src/social/social.conf.in @@ -1,5 +1,5 @@ [social] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ BINARY = gnunet-service-social RUN_PER_USER = YES diff --git a/src/statistics/statistics.conf.in b/src/statistics/statistics.conf.in index 2d0011372..36aca538f 100644 --- a/src/statistics/statistics.conf.in +++ b/src/statistics/statistics.conf.in @@ -1,5 +1,5 @@ [statistics] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @JAVAPORT@PORT = 2088 HOSTNAME = localhost BINARY = gnunet-service-statistics diff --git a/src/template/template.conf b/src/template/template.conf index 8c8c179f7..e5f675a5d 100644 --- a/src/template/template.conf +++ b/src/template/template.conf @@ -1,5 +1,5 @@ [template] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 9999 HOSTNAME = localhost BINARY = gnunet-service-template diff --git a/src/testbed-logger/testbed-logger.conf.in b/src/testbed-logger/testbed-logger.conf.in index 05ef782ae..288bbed72 100644 --- a/src/testbed-logger/testbed-logger.conf.in +++ b/src/testbed-logger/testbed-logger.conf.in @@ -1,5 +1,5 @@ [testbed] -AUTOSTART = NO +START_ON_DEMAND = NO @JAVAPORT@ PORT = 2101 HOSTNAME = localhost BINARY = gnunet-service-testbed @@ -90,7 +90,7 @@ SHARED_SERVICES = [testbed-logger] -AUTOSTART = NO +START_ON_DEMAND = NO @UNIXONLY@ PORT = 2102 HOSTNAME = localhost BINARY = gnunet-service-testbed-logger @@ -101,7 +101,7 @@ UNIX_MATCH_GID = YES [testbed-barrier] -AUTOSTART = NO +START_ON_DEMAND = NO @UNIXONLY@ PORT = 2103 HOSTNAME = localhost UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock @@ -112,7 +112,7 @@ UNIX_MATCH_GID = YES # This section is related to configuring underlay restrictions to simulate # connectivity restrictions of NAT boxes [testbed-underlay] -AUTOSTART = NO +START_ON_DEMAND = NO NOARMBIND = YES BINARY = gnunet-daemon-testbed-underlay # The sqlite3 database file containing information about what underlay @@ -120,8 +120,8 @@ BINARY = gnunet-daemon-testbed-underlay # DBFILE = [latency-logger] -AUTOSTART = NO +START_ON_DEMAND = NO NOARMBIND = YES BINARY = gnunet-daemon-latency-logger # The sqlite3 database file where the latency values are to be stored -# DBFILE = \ No newline at end of file +# DBFILE = diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in index 8cad6df09..846b894c7 100644 --- a/src/testbed/test_testbed_api_barriers.conf.in +++ b/src/testbed/test_testbed_api_barriers.conf.in @@ -1,5 +1,5 @@ [testbed] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 12113 ACCEPT_FROM = 127.0.0.1; HOSTNAME = localhost @@ -10,25 +10,25 @@ TOPOLOGY = RANDOM PORT = 12366 [test-barriers] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 12114 BINARY = /will/be/overwriten/in/test_testbed_api_barriers/ FORCESTART = YES [fs] -AUTOSTART = NO +START_ON_DEMAND = NO FORCESTART = NO [resolver] HOSTNAME = localhost -AUTOSTART = NO +START_ON_DEMAND = NO [cadet] -AUTOSTART = NO +START_ON_DEMAND = NO FORCESTART = NO [dht] -AUTOSTART = NO +START_ON_DEMAND = NO FORCESTART = NO [dhtcache] @@ -49,7 +49,7 @@ WAN_QUOTA_IN = 3932160 [core] PORT = 12092 -AUTOSTART = YES +START_ON_DEMAND = YES FORCESTART = YES USE_EPHEMERAL_KEYS = NO @@ -61,15 +61,15 @@ PORT = 12368 GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/ [dns] -AUTOSTART = NO +START_ON_DEMAND = NO FORCESTART = NO [nse] -AUTOSTART = NO +START_ON_DEMAND = NO FORCESTART = NO [vpn] -AUTOSTART = NO +START_ON_DEMAND = NO FORCESTART = NO [nat] @@ -77,27 +77,27 @@ RETURN_LOCAL_ADDRESSES = YES FORCESTART = NO [gns-helper-service-w32] -AUTOSTART = NO +START_ON_DEMAND = NO [consensus] -AUTOSTART = NO +START_ON_DEMAND = NO FORCESTART = NO [gns] -AUTOSTART = NO +START_ON_DEMAND = NO FORCESTART = NO [statistics] -AUTOSTART = NO +START_ON_DEMAND = NO FORCESTART = NO [peerinfo] NO_IO = YES [set] -AUTOSTART = NO +START_ON_DEMAND = NO FORCESTART = NO [revocation] -AUTOSTART = NO -FORCESTART = NO \ No newline at end of file +START_ON_DEMAND = NO +FORCESTART = NO diff --git a/src/testbed/test_testbed_api_statistics.conf b/src/testbed/test_testbed_api_statistics.conf index 65366835d..50d3f2c04 100644 --- a/src/testbed/test_testbed_api_statistics.conf +++ b/src/testbed/test_testbed_api_statistics.conf @@ -5,5 +5,5 @@ OVERLAY_TOPOLOGY = 2D_TORUS MAX_PARALLEL_SERVICE_CONNECTIONS = 2 [statistics] -AUTOSTART = YES +START_ON_DEMAND = YES PORT = 30 diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf index 049829842..d893ba143 100644 --- a/src/testbed/test_testbed_api_template.conf +++ b/src/testbed/test_testbed_api_template.conf @@ -2,7 +2,7 @@ @INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf [testbed] -AUTOSTART = NO +START_ON_DEMAND = NO PORT = 12113 ACCEPT_FROM = 127.0.0.1; HOSTNAME = localhost @@ -22,7 +22,7 @@ FORCESTART = YES # Transport requires resolver when connecting to a peer, so enable it [resolver] -AUTOSTART = YES +START_ON_DEMAND = YES [ats] WAN_QUOTA_OUT = 3932160 diff --git a/src/testbed/test_testbed_underlay.conf.in b/src/testbed/test_testbed_underlay.conf.in index 5799b5253..b46716cde 100644 --- a/src/testbed/test_testbed_underlay.conf.in +++ b/src/testbed/test_testbed_underlay.conf.in @@ -5,9 +5,9 @@ OVERLAY_TOPOLOGY = LINE OPERATION_TIMEOUT = 5 s [testbed-underlay] -AUTOSTART = NO +START_ON_DEMAND = NO DBFILE = /will/be/overwritten/by/testcase FORCESTART = YES [dv] -AUTOSTART = NO +START_ON_DEMAND = NO diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in index 86044fbfb..c1d64b324 100644 --- a/src/testbed/testbed.conf.in +++ b/src/testbed/testbed.conf.in @@ -1,5 +1,5 @@ [testbed] -AUTOSTART = NO +START_ON_DEMAND = NO @JAVAPORT@ PORT = 2101 HOSTNAME = localhost BINARY = gnunet-service-testbed @@ -90,7 +90,7 @@ SHARED_SERVICES = [testbed-barrier] -AUTOSTART = NO +START_ON_DEMAND = NO @UNIXONLY@ PORT = 2103 HOSTNAME = localhost UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock @@ -101,7 +101,7 @@ UNIX_MATCH_GID = YES # This section is related to configuring underlay restrictions to simulate # connectivity restrictions of NAT boxes [testbed-underlay] -AUTOSTART = NO +START_ON_DEMAND = NO NOARMBIND = YES BINARY = gnunet-daemon-testbed-underlay # The sqlite3 database file containing information about what underlay @@ -109,8 +109,8 @@ BINARY = gnunet-daemon-testbed-underlay # DBFILE = [latency-logger] -AUTOSTART = NO +START_ON_DEMAND = NO NOARMBIND = YES BINARY = gnunet-daemon-latency-logger # The sqlite3 database file where the latency values are to be stored -# DBFILE = \ No newline at end of file +# DBFILE = diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in index 1f56a2fa7..4185acc29 100644 --- a/src/transport/transport.conf.in +++ b/src/transport/transport.conf.in @@ -1,5 +1,5 @@ [transport] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @JAVAPORT@PORT = 2091 HOSTNAME = localhost BINARY = gnunet-service-transport diff --git a/src/util/resolver.conf.in b/src/util/resolver.conf.in index 9c5df32bc..6e2b9a869 100644 --- a/src/util/resolver.conf.in +++ b/src/util/resolver.conf.in @@ -1,5 +1,5 @@ [resolver] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @JAVAPORT@PORT = 2089 HOSTNAME = localhost BINARY = gnunet-service-resolver diff --git a/src/vpn/vpn.conf.in b/src/vpn/vpn.conf.in index 585131554..c0f4c59ed 100644 --- a/src/vpn/vpn.conf.in +++ b/src/vpn/vpn.conf.in @@ -1,5 +1,5 @@ [vpn] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ @UNIXONLY@ PORT = 2105 HOSTNAME = localhost BINARY = gnunet-service-vpn diff --git a/src/zonemaster/zonemaster.conf.in b/src/zonemaster/zonemaster.conf.in index 6179b87be..057e43f29 100644 --- a/src/zonemaster/zonemaster.conf.in +++ b/src/zonemaster/zonemaster.conf.in @@ -1,5 +1,5 @@ [zonemaster] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ FORCESTART = YES HOSTNAME = localhost BINARY = gnunet-service-zonemaster @@ -27,7 +27,7 @@ ZONE_PUBLISH_TIME_WINDOW = 4 h [zonemaster-monitor] -AUTOSTART = @AUTOSTART@ +START_ON_DEMAND = @START_ON_DEMAND@ FORCESTART = YES HOSTNAME = localhost BINARY = gnunet-service-zonemaster-monitor -- cgit v1.2.3