restructuring configs + enabling additional plugins

1 files changed, 22 insertions, 29 deletions

diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index f26925265..731331ba3 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -6,8 +6,29 @@ GNUNET_TEST_HOME = /tmp/c_no_nat_client/
 [PEER]
 PRIVATE_KEY = hostkeys/c_no_nat_client
 
+
+[transport]
+PLUGINS = tcp udp http_client https_client 
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
+PORT = 20029
+
+[transport-tcp]
+PORT = 20028
+ADVERTISED_PORT = 20028
+
+[transport-udp]
+PORT = 20027
+BROADCAST_INTERVAL = 30 s
+
+[hostlist]
+SERVERS = http://localhost:8080/
+
+[nat]
+BEHIND_NAT = NO
+DISABLEV6 = NO
+
+
 [arm]
-DEFAULTSERVICES = topology hostlist dht nse mesh fs
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
 PORT = 20022
 
@@ -53,10 +74,6 @@ PORT = 20018
 DATABASE = heap
 QUOTA = 50 MB
 
-[nat]
-BEHIND_NAT = NO
-DISABLEV6 = NO
-
 [gnunet-nat-server]
 PORT = 20020
 
@@ -64,23 +81,6 @@ PORT = 20020
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20
 PORT = 20023
 
-[transport]
-PLUGINS = tcp udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
-UNIX_MATCH_UID = NO
-PORT = 20029
-
-[transport-tcp]
-PORT = 20028
-ADVERTISED_PORT = 20028
-
-[transport-udp]
-PORT = 20027
-BROADCAST_INTERVAL = 30 s
-
-[hostlist]
-SERVERS = http://localhost:8080/
-
 [vpn]
 BINARY = gnunet-service-vpn
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29
@@ -114,10 +114,3 @@ PORT = 20038
 [dv]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-36
 PORT = 20039
-
-[transport-http]
-PORT = 20026
-
-[transport-https]
-PORT = 20025
-