From 362cc6cfa3cd9e7a9625d6c9841374331761ce88 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 11 May 2010 19:05:46 +0000 Subject: no more allow shutdown --- src/datastore/perf_plugin_datastore_data.conf | 1 - src/datastore/test_datastore_api_data.conf | 1 - src/dht/test_dht_api_data.conf | 10 ---------- src/dht/test_dht_api_peer1.conf | 10 ---------- src/dv/test_transport_api_data.conf | 9 --------- src/dv/test_transport_api_dv_peer1.conf | 10 ---------- src/dv/test_transport_api_dv_peer2.conf | 10 ---------- src/dv/test_transport_api_dv_peer3.conf | 10 ---------- src/fs/fs_test_lib_data.conf | 1 - src/transport/test_plugin_transport_data_http.conf | 2 -- src/transport/test_transport_api_data.conf | 9 --------- src/transport/test_transport_api_http_peer2.conf | 1 - src/transport/test_transport_api_udp_nat_peer1.conf | 9 --------- src/transport/test_transport_api_udp_nat_peer2.conf | 9 --------- 14 files changed, 92 deletions(-) (limited to 'src') diff --git a/src/datastore/perf_plugin_datastore_data.conf b/src/datastore/perf_plugin_datastore_data.conf index a573e8e54..388bda18e 100644 --- a/src/datastore/perf_plugin_datastore_data.conf +++ b/src/datastore/perf_plugin_datastore_data.conf @@ -9,7 +9,6 @@ CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-datastore ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -ALLOW_SHUTDOWN = YES QUOTA = 1000000 BLOOMFILTER = $SERVICEHOME/fs/bloomfilter DATABASE = sqlite diff --git a/src/datastore/test_datastore_api_data.conf b/src/datastore/test_datastore_api_data.conf index 6a92a00b3..bb72a40c4 100644 --- a/src/datastore/test_datastore_api_data.conf +++ b/src/datastore/test_datastore_api_data.conf @@ -19,7 +19,6 @@ CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-datastore ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -ALLOW_SHUTDOWN = YES QUOTA = 10000000 BLOOMFILTER = $SERVICEHOME/fs/bloomfilter DATABASE = sqlite diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf index 8b3c17ea4..c91fa7338 100644 --- a/src/dht/test_dht_api_data.conf +++ b/src/dht/test_dht_api_data.conf @@ -3,7 +3,6 @@ SERVICEHOME = /tmp/test-dht-api/ DEFAULTCONFIG = test_dht_api_data.conf [fs] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-fs @@ -20,7 +19,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db DATABASE = sqlite BLOOMFILTER = $SERVICEHOME/fs/bloomfilter QUOTA = 100000000 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-datastore @@ -51,7 +49,6 @@ MINIMUM-FRIENDS = 0 [core] TOTAL_QUOTA_OUT = 3932160 TOTAL_QUOTA_IN = 3932160 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-core @@ -62,7 +59,6 @@ PORT = 2092 [dht] DEBUG = YES -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-dht @@ -77,7 +73,6 @@ PORT = 12370 plugins = tcp DEBUG = NO PREFIX = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; NEIGHBOUR_LIMIT = 50 @@ -90,7 +85,6 @@ PORT = 2091 [peerinfo] TRUST = $SERVICEHOME/data/credit/ HOSTS = $SERVICEHOME/data/hosts/ -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-peerinfo @@ -100,7 +94,6 @@ HOSTNAME = localhost PORT = 2090 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -110,7 +103,6 @@ HOSTNAME = localhost PORT = 2089 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -121,7 +113,6 @@ PORT = 2088 [arm] DEFAULTSERVICES = resolver transport core -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -131,7 +122,6 @@ HOSTNAME = localhost PORT = 2087 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 2094 diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf index 500cc1c3f..10fc273a7 100644 --- a/src/dht/test_dht_api_peer1.conf +++ b/src/dht/test_dht_api_peer1.conf @@ -1,5 +1,4 @@ [fs] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-fs @@ -16,7 +15,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db DATABASE = sqlite BLOOMFILTER = $SERVICEHOME/fs/bloomfilter QUOTA = 100000000 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-datastore @@ -27,7 +25,6 @@ PORT = 2093 [dht] DEBUG = NO -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-dht @@ -67,7 +64,6 @@ PLUGINS = tcp DEBUG = NO #PREFIX = xterm -T transport2 -e gdb --command=cmd --args #PREFIX = valgrind --leak-check=full -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; NEIGHBOUR_LIMIT = 50 @@ -80,7 +76,6 @@ PORT = 12365 [peerinfo] TRUST = $SERVICEHOME/data/credit/ HOSTS = $SERVICEHOME/data/hosts/ -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-peerinfo @@ -90,7 +85,6 @@ HOSTNAME = localhost PORT = 12369 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -100,7 +94,6 @@ HOSTNAME = localhost PORT = 12364 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -112,7 +105,6 @@ PORT = 12367 [core] TOTAL_QUOTA_OUT = 3932160 TOTAL_QUOTA_IN = 3932160 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-core @@ -123,7 +115,6 @@ PORT = 12092 [arm] DEFAULTSERVICES = peerinfo core dht -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -133,7 +124,6 @@ HOSTNAME = localhost PORT = 12366 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 12368 diff --git a/src/dv/test_transport_api_data.conf b/src/dv/test_transport_api_data.conf index e36fa6455..4b51ece96 100644 --- a/src/dv/test_transport_api_data.conf +++ b/src/dv/test_transport_api_data.conf @@ -6,7 +6,6 @@ DEFAULTCONFIG = test_transport_api_data.conf PORT = 2094 [fs] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-fs @@ -23,7 +22,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db DATABASE = sqlite BLOOMFILTER = $SERVICEHOME/fs/bloomfilter QUOTA = 100000000 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-datastore @@ -54,7 +52,6 @@ MINIMUM-FRIENDS = 0 [core] TOTAL_QUOTA_OUT = 3932160 TOTAL_QUOTA_IN = 3932160 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-core @@ -67,7 +64,6 @@ PORT = 2092 plugins = tcp DEBUG = NO PREFIX = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; NEIGHBOUR_LIMIT = 50 @@ -80,7 +76,6 @@ PORT = 2091 [peerinfo] TRUST = $SERVICEHOME/data/credit/ HOSTS = $SERVICEHOME/data/hosts/ -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-peerinfo @@ -90,7 +85,6 @@ HOSTNAME = localhost PORT = 2090 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -100,7 +94,6 @@ HOSTNAME = localhost PORT = 2089 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -111,7 +104,6 @@ PORT = 2088 [arm] DEFAULTSERVICES = resolver transport core -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -121,7 +113,6 @@ HOSTNAME = localhost PORT = 2087 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 2094 diff --git a/src/dv/test_transport_api_dv_peer1.conf b/src/dv/test_transport_api_dv_peer1.conf index 13db5735c..f335439ae 100644 --- a/src/dv/test_transport_api_dv_peer1.conf +++ b/src/dv/test_transport_api_dv_peer1.conf @@ -1,5 +1,4 @@ [fs] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-fs @@ -16,7 +15,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db DATABASE = sqlite BLOOMFILTER = $SERVICEHOME/fs/bloomfilter QUOTA = 100000000 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-datastore @@ -50,7 +48,6 @@ DEBUG = NO #PREFIX = xterm -T transport2 -e gdb --command=cmd --args #PREFIX = valgrind --leak-check=full #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; NEIGHBOUR_LIMIT = 50 @@ -64,7 +61,6 @@ BLACKLIST_FILE = $SERVICEHOME/blacklist [peerinfo] TRUST = $SERVICEHOME/data/credit/ HOSTS = $SERVICEHOME/data/hosts/ -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-peerinfo @@ -74,7 +70,6 @@ HOSTNAME = localhost PORT = 12369 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -84,7 +79,6 @@ HOSTNAME = localhost PORT = 12364 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -95,7 +89,6 @@ PORT = 12367 [dv] DEBUG = NO -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; #BINARY = gnunet-service-dv @@ -110,7 +103,6 @@ PORT = 12370 [core] TOTAL_QUOTA_OUT = 3932160 TOTAL_QUOTA_IN = 3932160 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-core @@ -121,7 +113,6 @@ PORT = 12092 [arm] DEFAULTSERVICES = core dv statistics -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -131,7 +122,6 @@ HOSTNAME = localhost PORT = 12366 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 12368 diff --git a/src/dv/test_transport_api_dv_peer2.conf b/src/dv/test_transport_api_dv_peer2.conf index c9a79ed0b..78d9af072 100644 --- a/src/dv/test_transport_api_dv_peer2.conf +++ b/src/dv/test_transport_api_dv_peer2.conf @@ -1,5 +1,4 @@ [fs] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-fs @@ -15,7 +14,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db [core] TOTAL_QUOTA_OUT = 3932160 TOTAL_QUOTA_IN = 3932160 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-core @@ -28,7 +26,6 @@ PORT = 22092 DATABASE = sqlite BLOOMFILTER = $SERVICEHOME/fs/bloomfilter QUOTA = 100000000 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-datastore @@ -60,7 +57,6 @@ MINIMUM-FRIENDS = 0 PLUGINS = tcp dv DEBUG = NO # PREFIX = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; NEIGHBOUR_LIMIT = 50 @@ -77,7 +73,6 @@ BLACKLIST_FILE = $SERVICEHOME/blacklist [peerinfo] TRUST = $SERVICEHOME/data/credit/ HOSTS = $SERVICEHOME/data/hosts/ -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-peerinfo @@ -87,7 +82,6 @@ HOSTNAME = localhost PORT = 22369 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -97,7 +91,6 @@ HOSTNAME = localhost PORT = 22364 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -108,7 +101,6 @@ PORT = 22367 [dv] DEBUG = NO -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; #BINARY = gnunet-service-dv @@ -122,7 +114,6 @@ PORT = 22370 [arm] DEFAULTSERVICES = core dv statistics -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -132,7 +123,6 @@ HOSTNAME = localhost PORT = 22366 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 22368 diff --git a/src/dv/test_transport_api_dv_peer3.conf b/src/dv/test_transport_api_dv_peer3.conf index 0111ce31d..6522bc50a 100644 --- a/src/dv/test_transport_api_dv_peer3.conf +++ b/src/dv/test_transport_api_dv_peer3.conf @@ -1,5 +1,4 @@ [fs] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-fs @@ -16,7 +15,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db DATABASE = sqlite BLOOMFILTER = $SERVICEHOME/fs/bloomfilter QUOTA = 100000000 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-datastore @@ -47,7 +45,6 @@ MINIMUM-FRIENDS = 0 [transport] PLUGINS = tcp dv DEBUG = NO -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; NEIGHBOUR_LIMIT = 50 @@ -65,7 +62,6 @@ BLACKLIST_FILE = $SERVICEHOME/blacklist [peerinfo] TRUST = $SERVICEHOME/data/credit/ HOSTS = $SERVICEHOME/data/hosts/ -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-peerinfo @@ -75,7 +71,6 @@ HOSTNAME = localhost PORT = 32369 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -87,7 +82,6 @@ PORT = 32364 [core] TOTAL_QUOTA_OUT = 3932160 TOTAL_QUOTA_IN = 3932160 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-core @@ -97,7 +91,6 @@ HOSTNAME = localhost PORT = 32092 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -108,7 +101,6 @@ PORT = 32367 [dv] DEBUG = YES -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-dv @@ -122,7 +114,6 @@ PORT = 32370 [arm] DEFAULTSERVICES = core dv statistics -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -132,7 +123,6 @@ HOSTNAME = localhost PORT = 32366 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 32368 diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf index 24afb18a2..a4941af7b 100644 --- a/src/fs/fs_test_lib_data.conf +++ b/src/fs/fs_test_lib_data.conf @@ -29,7 +29,6 @@ PORT = 43467 HOSTNAME = localhost [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 #PORT = 43468 #DEBUG = YES diff --git a/src/transport/test_plugin_transport_data_http.conf b/src/transport/test_plugin_transport_data_http.conf index 63272b203..c5c30fc7c 100644 --- a/src/transport/test_plugin_transport_data_http.conf +++ b/src/transport/test_plugin_transport_data_http.conf @@ -7,7 +7,6 @@ PORT = 12389 DEBUG = YES [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -18,7 +17,6 @@ PORT = 12367 [arm] DEFAULTSERVICES = resolver transport core statistics topology hostlist -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf index 0a5c8f02e..4e0c409cb 100644 --- a/src/transport/test_transport_api_data.conf +++ b/src/transport/test_transport_api_data.conf @@ -6,7 +6,6 @@ DEFAULTCONFIG = test_transport_api_data.conf PORT = 2094 [fs] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-fs @@ -23,7 +22,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db DATABASE = sqlite BLOOMFILTER = $SERVICEHOME/fs/bloomfilter QUOTA = 100000000 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-datastore @@ -54,7 +52,6 @@ MINIMUM-FRIENDS = 0 [core] TOTAL_QUOTA_OUT = 3932160 TOTAL_QUOTA_IN = 3932160 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-core @@ -67,7 +64,6 @@ PORT = 2092 plugins = udp DEBUG = NO PREFIX = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; NEIGHBOUR_LIMIT = 50 @@ -80,7 +76,6 @@ PORT = 2091 [peerinfo] TRUST = $SERVICEHOME/data/credit/ HOSTS = $SERVICEHOME/data/hosts/ -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-peerinfo @@ -90,7 +85,6 @@ HOSTNAME = localhost PORT = 2090 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -100,7 +94,6 @@ HOSTNAME = localhost PORT = 2089 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -111,7 +104,6 @@ PORT = 2088 [arm] DEFAULTSERVICES = resolver transport core -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -121,7 +113,6 @@ HOSTNAME = localhost PORT = 2087 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 2094 diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index 2d2cebec0..47999978a 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf @@ -50,7 +50,6 @@ MINIMUM-FRIENDS = 0 PLUGINS = http DEBUG = YES # PREFIX = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; NEIGHBOUR_LIMIT = 50 diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf index c30777acc..d2ab3ecee 100644 --- a/src/transport/test_transport_api_udp_nat_peer1.conf +++ b/src/transport/test_transport_api_udp_nat_peer1.conf @@ -5,7 +5,6 @@ INTERNAL_ADDRESS = 127.0.0.1 EXTERNAL_ADDRESS = 127.0.0.1 [fs] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-fs @@ -22,7 +21,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db DATABASE = sqlite BLOOMFILTER = $SERVICEHOME/fs/bloomfilter QUOTA = 100000000 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-datastore @@ -53,7 +51,6 @@ MINIMUM-FRIENDS = 0 [core] TOTAL_QUOTA_OUT = 3932160 TOTAL_QUOTA_IN = 3932160 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-core @@ -65,7 +62,6 @@ PORT = 2092 [transport] PLUGINS = udp_nat DEBUG = NO -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; NEIGHBOUR_LIMIT = 50 @@ -80,7 +76,6 @@ PORT = 12365 [peerinfo] TRUST = $SERVICEHOME/data/credit/ HOSTS = $SERVICEHOME/data/hosts/ -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-peerinfo @@ -90,7 +85,6 @@ HOSTNAME = localhost PORT = 12369 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -100,7 +94,6 @@ HOSTNAME = localhost PORT = 12364 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -111,7 +104,6 @@ PORT = 12367 [arm] DEFAULTSERVICES = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -121,7 +113,6 @@ HOSTNAME = localhost PORT = 12366 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 12368 diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf index 5ec73f6ef..32d8cab23 100644 --- a/src/transport/test_transport_api_udp_nat_peer2.conf +++ b/src/transport/test_transport_api_udp_nat_peer2.conf @@ -5,7 +5,6 @@ EXTERNAL_ADDRESS = 127.0.0.1 INTERNAL_ADDRESS = 127.0.0.1 [fs] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-fs @@ -22,7 +21,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db DATABASE = sqlite BLOOMFILTER = $SERVICEHOME/fs/bloomfilter QUOTA = 100000000 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-datastore @@ -53,7 +51,6 @@ MINIMUM-FRIENDS = 0 [core] TOTAL_QUOTA_OUT = 3932160 TOTAL_QUOTA_IN = 3932160 -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-core @@ -66,7 +63,6 @@ PORT = 2092 PLUGINS = udp_nat DEBUG = NO PREFIX = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; NEIGHBOUR_LIMIT = 50 @@ -80,7 +76,6 @@ PORT = 22365 [peerinfo] TRUST = $SERVICEHOME/data/credit/ HOSTS = $SERVICEHOME/data/hosts/ -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-peerinfo @@ -90,7 +85,6 @@ HOSTNAME = localhost PORT = 22369 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -100,7 +94,6 @@ HOSTNAME = localhost PORT = 22364 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -111,7 +104,6 @@ PORT = 22367 [arm] DEFAULTSERVICES = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -121,7 +113,6 @@ HOSTNAME = localhost PORT = 22366 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 22368 -- cgit v1.2.3