From 10dd11ff86ffd4661e1d3b70f21c27d8a1640439 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 20 May 2010 12:42:54 +0000 Subject: config fixes, do not start core, datastore, fs --- src/transport/test_transport_api_data.conf | 33 +++--------------------- src/transport/test_transport_api_http_peer1.conf | 27 +++++-------------- src/transport/test_transport_api_http_peer2.conf | 26 ++++--------------- src/transport/test_transport_api_tcp_peer1.conf | 26 ++++--------------- src/transport/test_transport_api_tcp_peer2.conf | 26 ++++--------------- src/transport/test_transport_api_udp_peer1.conf | 26 ++++--------------- src/transport/test_transport_api_udp_peer2.conf | 26 ++++--------------- 7 files changed, 34 insertions(+), 156 deletions(-) diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf index bf9173cb0..dc1096cc6 100644 --- a/src/transport/test_transport_api_data.conf +++ b/src/transport/test_transport_api_data.conf @@ -6,29 +6,10 @@ DEFAULTCONFIG = test_transport_api_data.conf PORT = 2094 [fs] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-fs -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2094 -INDEXDB = $SERVICEHOME/idxinfo.lst - -[datastore-sqlite] -FILENAME = $SERVICEHOME/datastore/sqlite.db +AUTOSTART = NO [datastore] -DATABASE = sqlite -BLOOMFILTER = $SERVICEHOME/fs/bloomfilter -QUOTA = 100000000 -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-datastore -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2093 +AUTOSTART = NO [hostlist] HTTP-PROXY = @@ -50,15 +31,7 @@ FRIENDS-ONLY = NO MINIMUM-FRIENDS = 0 [core] -TOTAL_QUOTA_OUT = 3932160 -TOTAL_QUOTA_IN = 3932160 -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-core -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2092 +AUTOSTART = NO [transport] plugins = udp diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index 1e458c346..0a1814068 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf @@ -2,30 +2,15 @@ #PORT = 12368 DEBUG=YES -[fs] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-fs -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2094 -INDEXDB = $SERVICEHOME/idxinfo.lst -[datastore-sqlite] -FILENAME = $SERVICEHOME/datastore/sqlite.db +[fs] +AUTOSTART = NO [datastore] -DATABASE = sqlite -BLOOMFILTER = $SERVICEHOME/fs/bloomfilter -QUOTA = 100000000 -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-datastore -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2093 +AUTOSTART = NO + +[core] +AUTOSTART = NO [hostlist] HTTP-PROXY = diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index 47999978a..7ccf5984d 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf @@ -3,29 +3,13 @@ PORT = 22368 DEBUG = YES [fs] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-fs -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2094 -INDEXDB = $SERVICEHOME/idxinfo.lst - -[datastore-sqlite] -FILENAME = $SERVICEHOME/datastore/sqlite.db +AUTOSTART = NO [datastore] -DATABASE = sqlite -BLOOMFILTER = $SERVICEHOME/fs/bloomfilter -QUOTA = 100000000 -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-datastore -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2093 +AUTOSTART = NO + +[core] +AUTOSTART = NO [hostlist] HTTP-PROXY = diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index b1160070e..719dc1c79 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf @@ -2,29 +2,13 @@ PORT = 12368 [fs] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-fs -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2094 -INDEXDB = $SERVICEHOME/idxinfo.lst - -[datastore-sqlite] -FILENAME = $SERVICEHOME/datastore/sqlite.db +AUTOSTART = NO [datastore] -DATABASE = sqlite -BLOOMFILTER = $SERVICEHOME/fs/bloomfilter -QUOTA = 100000000 -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-datastore -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2093 +AUTOSTART = NO + +[core] +AUTOSTART = NO [hostlist] HTTP-PROXY = diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index 8c2fc23f0..cddce5926 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf @@ -1,30 +1,14 @@ [transport-tcp] PORT = 22368 -[fs] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-fs -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2094 -INDEXDB = $SERVICEHOME/idxinfo.lst +[core] +AUTOSTART = NO -[datastore-sqlite] -FILENAME = $SERVICEHOME/datastore/sqlite.db +[fs] +AUTOSTART = NO [datastore] -DATABASE = sqlite -BLOOMFILTER = $SERVICEHOME/fs/bloomfilter -QUOTA = 100000000 -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-datastore -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2093 +AUTOSTART = NO [hostlist] HTTP-PROXY = diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index aca0b69ab..e1ff1644e 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf @@ -2,29 +2,13 @@ PORT = 12368 [fs] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-fs -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2094 -INDEXDB = $SERVICEHOME/idxinfo.lst - -[datastore-sqlite] -FILENAME = $SERVICEHOME/datastore/sqlite.db +AUTOSTART = NO [datastore] -DATABASE = sqlite -BLOOMFILTER = $SERVICEHOME/fs/bloomfilter -QUOTA = 100000000 -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-datastore -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2093 +AUTOSTART = NO + +[core] +AUTOSTART = NO [hostlist] HTTP-PROXY = diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index 264f2a508..cb4d4778d 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf @@ -2,29 +2,13 @@ PORT = 22368 [fs] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-fs -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2094 -INDEXDB = $SERVICEHOME/idxinfo.lst - -[datastore-sqlite] -FILENAME = $SERVICEHOME/datastore/sqlite.db +AUTOSTART = NO [datastore] -DATABASE = sqlite -BLOOMFILTER = $SERVICEHOME/fs/bloomfilter -QUOTA = 100000000 -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-datastore -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2093 +AUTOSTART = NO + +[core] +AUTOSTART = NO [hostlist] HTTP-PROXY = -- cgit v1.2.3