Cleaned up code

[oweals/gnunet.git] / src / transport / test_transport_api_http_peer2.conf

diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index 2ca26fddd9a8bf30cba86bc7ece2dbdd9f2c3487..15a562b6e1ca47a82b0ec97a2d923491939648d2 100644 (file)
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -1,32 +1,16 @@
 [transport-http]
 PORT = 22368
+DEBUG = YES
+BINDTO = 127.0.0.1
 
 [fs]
-ALLOW_SHUTDOWN = YES
-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
-ALLOW_SHUTDOWN = YES
-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 = 
@@ -49,9 +33,9 @@ MINIMUM-FRIENDS = 0
 
 [transport]
 PLUGINS = http
-#DEBUG = YES
+#PLUGINS = tcp http
+DEBUG = NO
 # PREFIX = 
-ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
@@ -60,13 +44,13 @@ CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 22365
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = xterm -T transport1 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
 
 [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,9 +58,9 @@ CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 22369
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
-ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-resolver
@@ -84,9 +68,9 @@ CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 22364
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
-ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-statistics
@@ -94,10 +78,11 @@ CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 22367
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+
 
 [arm]
 DEFAULTSERVICES = 
-ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-arm
@@ -105,11 +90,16 @@ CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 22366
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+
+
+[transport-http]
+PORT = 22389
+DEBUG = NO
 
 [transport-tcp]
-ALLOW_SHUTDOWN = NO
-TIMEOUT = 300000
-PORT = 22368
+PORT = 22399
+DEBUG = YES
 
 [TESTING]
 WEAKRANDOM = YES