restructuring configs + enabling additional plugins

1 files changed, 28 insertions, 23 deletions

diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index f6bd4a439..b6653ccd5 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -1,12 +1,39 @@
 @INLINE@ confs/test_defaults.conf
 
-
 [PATHS]
 GNUNET_TEST_HOME = /tmp/c_bootstrap_server/
 
 [PEER]
 PRIVATE_KEY = hostkeys/c_bootstrap_server
 
+
+[transport]
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-8
+PORT = 20011
+PLUGINS = tcp udp http_client https_client http_server https_server
+
+[transport-tcp]
+PORT = 20010
+ADVERTISED_PORT = 20010
+
+[transport-udp]
+PORT = 20009
+
+[transport-http_server]
+PORT = 20008
+
+[transport-https_server]
+PORT = 20007
+
+[hostlist]
+OPTIONS = -p
+SERVERs = 
+
+[nat]
+BEHIND_NAT = NO
+DISABLEV6 = NO
+
+
 [arm]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-4
 PORT = 20004
@@ -45,17 +72,6 @@ BEHIND_NAT = NO
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-6
 PORT = 20005
 
-[transport]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-8
-PORT = 20011
-
-[transport-tcp]
-PORT = 20010
-ADVERTISED_PORT = 20010
-
-[transport-udp]
-PORT = 20009
-
 [gns]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-gns-15
 PORT = 20018
@@ -64,12 +80,6 @@ PORT = 20018
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-16
 PORT = 20019
 
-
-
-[hostlist]
-OPTIONS = -p
-SERVERs = 
-
 [vpn]
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-15
 
@@ -85,10 +95,5 @@ PORT = 20001
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-12
 PORT = 20015
 
-[transport-http]
-PORT = 20008
-
-[transport-https]
-PORT = 20007