[GNUnet-SVN] r31487 - gnunet/src/integration-tests/confs

[gnunet]

Author: wachs
Date: 2013-12-17 17:20:05 +0100 (Tue, 17 Dec 2013)
New Revision: 31487

Modified:
   gnunet/src/integration-tests/confs/c_nat_client.conf
   gnunet/src/integration-tests/confs/test_defaults.conf
Log:
clean up for configs


Modified: gnunet/src/integration-tests/confs/c_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_nat_client.conf        2013-12-17 
16:16:28 UTC (rev 31486)
+++ gnunet/src/integration-tests/confs/c_nat_client.conf        2013-12-17 
16:20:05 UTC (rev 31487)
@@ -10,7 +10,7 @@
 [transport]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50
 PORT = 20065
-PLUGINS = tcp udp
+PLUGINS = tcp udp http_client https_client
 
 [transport-tcp]
 PORT = 0

Modified: gnunet/src/integration-tests/confs/test_defaults.conf
===================================================================
--- gnunet/src/integration-tests/confs/test_defaults.conf       2013-12-17 
16:16:28 UTC (rev 31486)
+++ gnunet/src/integration-tests/confs/test_defaults.conf       2013-12-17 
16:20:05 UTC (rev 31487)
@@ -1,9 +1,25 @@
 [arm]
 DEFAULTSERVICES = topology hostlist fs
 
-[namestore]
-AUTOSTART = NO
+[peerinfo]
+USE_INCLUDED_HELLOS = NO
 
+[transport-tcp]
+USE_LOCALADDR = YES
+
+[transport-udp]
+BROADCAST = NO
+USE_LOCALADDR = YES
+
+[nat]
+BEHIND_NAT = NO
+EXTERNAL_ADDRESS = 127.0.0.1
+INTERNAL_ADDRESS = 127.0.0.1
+BINDTO = 127.0.0.1
+
+[hostlist]
+SERVERS =
+
 [dns]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-47
 PORT = 0
@@ -11,22 +27,12 @@
 ACCEPT_FROM6 = ::1;
 PROVIDE_EXIT = NO
 
-[consensus]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
 [ats]
 WAN_QUOTA_IN = unlimited
 WAN_QUOTA_OUT = unlimited
 ATS_MIN_INTERVAL = 15000
 ATS_EXEC_INTERVAL = 30000
 
-[mesh]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-55
-PORT = 20070
-
 [datastore]
 UNIX_MATCH_UID = YES
 QUOTA = 100 MB
@@ -39,12 +45,6 @@
 [TESTING]
 WEAKRANDOM = NO
 
-[nat]
-BEHIND_NAT = NO
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-BINDTO = 127.0.0.1
-
 [fs]
 INDEXDB = $GNUNET_TEST_HOME/idxinfo.lst
 IDENTITY_DIR = $GNUNET_TEST_HOME/identities/
@@ -52,28 +52,21 @@
 UPDATE_DIR = $GNUNET_TEST_HOME/updates/
 TRUST = $GNUNET_TEST_HOME/data/credit/
 
-[transport-tcp]
-USE_LOCALADDR = YES
+[mesh]
+AUTOSTART = NO
 
-[transport-udp]
-BROADCAST = NO
-BROADCAST_INTERVAL = 30000
-USE_LOCALADDR = YES
+[consensus]
+AUTOSTART = NO
 
-[hostlist]
-SERVERS =
+[lockmanager]
+AUTOSTART = NO
 
+[namestore]
+AUTOSTART = NO
+
 [vpn]
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-57
-PORT = 0
+AUTOSTART = NO
 
-[peerinfo]
-USE_INCLUDED_HELLOS = NO
-
-[statistics]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-44
-PORT = 20055
-
 [template]
 AUTOSTART = NO
 
@@ -114,7 +107,6 @@
 [gns]
 AUTOSTART = NO
 
-
 [datacache-mysql]
 DATABASE = gnunet
 CONFIG = ~/.my.cnf