From f25494a08e36b01073c72154ee6492aed8133d0c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 11 May 2010 17:48:14 +0000 Subject: fixing configs --- src/core/test_core_api_peer1.conf | 7 +++++++ src/core/test_core_api_peer2.conf | 7 +++++++ src/hostlist/test_gnunet_daemon_hostlist_peer1.conf | 3 ++- src/transport/test_transport_api_http_peer1.conf | 8 -------- src/transport/test_transport_api_http_peer2.conf | 7 ------- src/transport/test_transport_api_tcp_peer1.conf | 8 -------- src/transport/test_transport_api_tcp_peer2.conf | 8 -------- src/transport/test_transport_api_udp_peer1.conf | 9 --------- src/transport/test_transport_api_udp_peer2.conf | 9 --------- 9 files changed, 16 insertions(+), 50 deletions(-) diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf index e472238d7..a6888b683 100644 --- a/src/core/test_core_api_peer1.conf +++ b/src/core/test_core_api_peer1.conf @@ -45,3 +45,10 @@ PORT = 12470 [testing] WEAKRANDOM = YES + +[fs] +AUTOSTART = NO + +[datastore] +AUTOSTART = NO + diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf index b7de82d0f..9f7f89c0f 100644 --- a/src/core/test_core_api_peer2.conf +++ b/src/core/test_core_api_peer2.conf @@ -43,3 +43,10 @@ PORT = 22470 [testing] WEAKRANDOM = YES + +[fs] +AUTOSTART = NO + +[datastore] +AUTOSTART = NO + diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf index 2a46763bf..19874f022 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf @@ -53,4 +53,5 @@ DEBUG = NO AUTOSTART = NO [datastore] -AUTOSTART = NO[fs] +AUTOSTART = NO + diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index 2f9e3425d..1e458c346 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf @@ -3,7 +3,6 @@ DEBUG=YES [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 @@ -53,7 +51,6 @@ PLUGINS = http DEBUG = YES #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 @@ -66,7 +63,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 @@ -76,7 +72,6 @@ HOSTNAME = localhost PORT = 12369 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -86,7 +81,6 @@ HOSTNAME = localhost PORT = 12364 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -97,7 +91,6 @@ PORT = 12367 [arm] DEFAULTSERVICES = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -107,7 +100,6 @@ HOSTNAME = localhost PORT = 12366 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 12368 diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index 44bb71f26..2d2cebec0 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf @@ -3,7 +3,6 @@ PORT = 22368 DEBUG = YES [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 @@ -67,7 +65,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 @@ -77,7 +74,6 @@ HOSTNAME = localhost PORT = 22369 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -87,7 +83,6 @@ HOSTNAME = localhost PORT = 22364 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -98,7 +93,6 @@ PORT = 22367 [arm] DEFAULTSERVICES = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -108,7 +102,6 @@ HOSTNAME = localhost PORT = 22366 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 22368 diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index 77902fd20..b1160070e 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf @@ -2,7 +2,6 @@ PORT = 12368 [fs] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-fs @@ -19,7 +18,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 @@ -52,7 +50,6 @@ PLUGINS = tcp #DEBUG = YES #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 @@ -65,7 +62,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 @@ -75,7 +71,6 @@ HOSTNAME = localhost PORT = 12369 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -85,7 +80,6 @@ HOSTNAME = localhost PORT = 12364 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -96,7 +90,6 @@ PORT = 12367 [arm] DEFAULTSERVICES = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -106,7 +99,6 @@ HOSTNAME = localhost PORT = 12366 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 12368 diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index a0cf25720..8c2fc23f0 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf @@ -2,7 +2,6 @@ PORT = 22368 [fs] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-fs @@ -19,7 +18,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 PLUGINS = tcp #DEBUG = YES # PREFIX = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; NEIGHBOUR_LIMIT = 50 @@ -66,7 +63,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 @@ -76,7 +72,6 @@ HOSTNAME = localhost PORT = 22369 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -86,7 +81,6 @@ HOSTNAME = localhost PORT = 22364 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -97,7 +91,6 @@ PORT = 22367 [arm] DEFAULTSERVICES = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -107,7 +100,6 @@ HOSTNAME = localhost PORT = 22366 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 22368 diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index e33b5de9a..aca0b69ab 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf @@ -2,7 +2,6 @@ PORT = 12368 [fs] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-fs @@ -19,7 +18,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 @@ 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 [transport] PLUGINS = udp DEBUG = NO -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; NEIGHBOUR_LIMIT = 50 @@ -77,7 +73,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 @@ -87,7 +82,6 @@ HOSTNAME = localhost PORT = 12369 [resolver] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-resolver @@ -97,7 +91,6 @@ HOSTNAME = localhost PORT = 12364 [statistics] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-statistics @@ -108,7 +101,6 @@ PORT = 12367 [arm] DEFAULTSERVICES = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -118,7 +110,6 @@ HOSTNAME = localhost PORT = 12366 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 12368 diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index f10aedd1f..264f2a508 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf @@ -2,7 +2,6 @@ PORT = 22368 [fs] -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-fs @@ -19,7 +18,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 @@ 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 @@ -63,7 +60,6 @@ PORT = 2092 PLUGINS = udp DEBUG = NO PREFIX = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; NEIGHBOUR_LIMIT = 50 @@ -77,7 +73,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 @@ -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 [arm] DEFAULTSERVICES = -ALLOW_SHUTDOWN = YES ACCEPT_FROM6 = ::1; ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-arm @@ -118,7 +110,6 @@ HOSTNAME = localhost PORT = 22366 [transport-tcp] -ALLOW_SHUTDOWN = NO TIMEOUT = 300000 PORT = 22368 -- cgit v1.2.3