clean up for configs

2 files changed, 29 insertions, 37 deletions

diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index d4126a8b5..e8cdf6fa8 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -10,7 +10,7 @@ PRIVATE_KEY = hostkeys/c_nat_client
 [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
diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf
index d1229262b..4477b296e 100644
--- a/src/integration-tests/confs/test_defaults.conf
+++ b/src/integration-tests/confs/test_defaults.conf
@@ -1,8 +1,24 @@
 [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
@@ -11,22 +27,12 @@ ACCEPT_FROM = 127.0.0.1;
 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 @@ QUOTA = 1 MB
 [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,27 +52,20 @@ STATE_DIR = $GNUNET_TEST_HOME/persistence/
 UPDATE_DIR = $GNUNET_TEST_HOME/updates/
 TRUST = $GNUNET_TEST_HOME/data/credit/
 
-[transport-tcp]
-USE_LOCALADDR = YES
-
-[transport-udp]
-BROADCAST = NO
-BROADCAST_INTERVAL = 30000
-USE_LOCALADDR = YES
+[mesh]
+AUTOSTART = NO
 
-[hostlist]
-SERVERS =
+[consensus]
+AUTOSTART = NO
 
-[vpn]
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-57
-PORT = 0
+[lockmanager]
+AUTOSTART = NO
 
-[peerinfo]
-USE_INCLUDED_HELLOS = NO
+[namestore]
+AUTOSTART = NO
 
-[statistics]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-44
-PORT = 20055
+[vpn]
+AUTOSTART = NO
 
 [template]
 AUTOSTART = NO
@@ -114,7 +107,6 @@ AUTOSTART = NO
 [gns]
 AUTOSTART = NO
 
-
 [datacache-mysql]
 DATABASE = gnunet
 CONFIG = ~/.my.cnf