1 files changed, 17 insertions, 22 deletions
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf
index 61a6a3b..8cdd24f 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -1,6 +1,5 @@
 [PATHS]
 SERVICEHOME = /tmp/c_no_nat_client_2/
-DEFAULTCONFIG = confs/c_no_nat_client_2.conf
 
 [gnunetd]
 #HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@ AUTOSTART = YES
 PORT = 20053
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-resolver
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -24,7 +22,6 @@ AUTOSTART = YES
 PORT = 20052
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-mesh
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -37,7 +34,6 @@ AUTOSTART = YES
 PORT = 20051
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-nse
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -48,7 +44,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof
 HISTOGRAM = $SERVICEHOME/nse-history.log
 WORKDELAY = 5 ms
 INTERVAL = 1 h
-WORKBITS = 26
+WORKBITS = 1
 
 [topology]
 MINIMUM-FRIENDS = 0
@@ -56,7 +52,6 @@ FRIENDS-ONLY = NO
 AUTOCONNECT = YES
 TARGET-CONNECTION-COUNT = 16
 FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-topology
 
 [datastore]
@@ -67,7 +62,6 @@ UNIX_MATCH_GID = YES
 PORT = 20050
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-datastore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -90,7 +84,6 @@ AUTOSTART = YES
 PORT = 20049
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-peerinfo
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -114,15 +107,14 @@ AUTOSTART = YES
 PORT = 20048
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-ats
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 UNIXPATH = /tmp/test-service-ats-37
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
-WAN_QUOTA_IN = 65536
-WAN_QUOTA_OUT = 65536
+WAN_QUOTA_IN = unlimited
+WAN_QUOTA_OUT = unlimited
 DUMP_MLP = NO
 DUMP_SOLUTION = NO
 DUMP_OVERWRITE = NO
@@ -136,7 +128,6 @@ AUTOSTART = YES
 PORT = 20047
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-transport
 NEIGHBOUR_LIMIT = 50
 ACCEPT_FROM = 127.0.0.1;
@@ -188,7 +179,6 @@ AUTOSTART = NO
 PORT = 20042
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-template
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -206,7 +196,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
 PORT = 20041
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-fs
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -221,7 +210,6 @@ MIN_MIGRATION_DELAY = 100 ms
 EXPECTED_NEIGHBOUR_COUNT = 128
 
 [vpn]
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-vpn
 IPV6ADDR = 1234::1
 IPV6PREFIX = 32
@@ -232,7 +220,6 @@ VIRTDNS6 = 1234::17
 IFNAME = vpn-gnunet
 
 [exit]
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-exit
 IPV6ADDR = 1234:1::1
 IPV6PREFIX = 32
@@ -247,7 +234,6 @@ AUTOSTART = YES
 PORT = 0
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-dns
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -258,7 +244,6 @@ PROVIDE_EXIT = NO
 PORT = 20040
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -271,7 +256,6 @@ UNIX_MATCH_GID = YES
 HTTPPORT = 8080
 HOME = $SERVICEHOME
 HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-hostlist
 OPTIONS = -b
 SERVERS = http://localhost:8080/
@@ -282,7 +266,6 @@ AUTOSTART = YES
 PORT = 20039
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-core
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -316,7 +299,6 @@ AUTOSTART = YES
 PORT = 20037
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-statistics
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -329,7 +311,6 @@ AUTOSTART = YES
 PORT = 20036
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-dht
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -342,6 +323,16 @@ UNIX_MATCH_GID = YES
 DATABASE = sqlite
 QUOTA = 1 MB
 
+[chat]
+UNIXPATH = /tmp/test-service-chat-b_no_nat_c-2
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_no_nat_c-2
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
 [gns]
 AUTOSTART = NO
 
@@ -349,3 +340,7 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+[consensus]
+AUTOSTART = NO
+
+