Imported Upstream version 0.9.5a

1 files changed, 18 insertions, 24 deletions

diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index 7235fca..4ead99d 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -1,6 +1,5 @@
 [PATHS]
 SERVICEHOME = /tmp/c_bootstrap_server/
-DEFAULTCONFIG = confs/c_bootstrap_server.conf
 
 [gnunetd]
 #HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@ AUTOSTART = YES
 PORT = 0
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-dns
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -22,7 +20,6 @@ AUTOSTART = YES
 PORT = 20017
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-resolver
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -35,7 +32,6 @@ AUTOSTART = YES
 PORT = 20016
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-mesh
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -48,7 +44,6 @@ AUTOSTART = YES
 PORT = 20015
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-nse
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -59,7 +54,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof
 HISTOGRAM = $SERVICEHOME/nse-history.log
 WORKDELAY = 5 ms
 INTERVAL = 1 h
-WORKBITS = 26
+WORKBITS = 1
 
 [topology]
 MINIMUM-FRIENDS = 0
@@ -67,7 +62,6 @@ FRIENDS-ONLY = NO
 AUTOCONNECT = YES
 TARGET-CONNECTION-COUNT = 16
 FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-topology
 
 [datastore]
@@ -78,7 +72,6 @@ UNIX_MATCH_GID = YES
 PORT = 20014
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-datastore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -101,7 +94,6 @@ AUTOSTART = YES
 PORT = 20013
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-peerinfo
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -125,15 +117,14 @@ AUTOSTART = YES
 PORT = 20012
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-ats
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 UNIXPATH = /tmp/test-service-ats-9
 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
@@ -147,7 +138,6 @@ AUTOSTART = YES
 PORT = 20011
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-transport
 NEIGHBOUR_LIMIT = 50
 ACCEPT_FROM = 127.0.0.1;
@@ -199,7 +189,6 @@ AUTOSTART = NO
 PORT = 20006
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-template
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -217,7 +206,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
 PORT = 20005
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-fs
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -232,7 +220,6 @@ MIN_MIGRATION_DELAY = 100 ms
 EXPECTED_NEIGHBOUR_COUNT = 128
 
 [vpn]
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-vpn
 IPV6ADDR = 1234::1
 IPV6PREFIX = 32
@@ -243,7 +230,6 @@ VIRTDNS6 = 1234::17
 IFNAME = vpn-gnunet
 
 [exit]
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-exit
 IPV6ADDR = 1234:1::1
 IPV6PREFIX = 32
@@ -258,7 +244,6 @@ AUTOSTART = YES
 PORT = 0
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-dns
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -269,7 +254,6 @@ PROVIDE_EXIT = NO
 PORT = 20004
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -282,7 +266,6 @@ UNIX_MATCH_GID = YES
 HTTPPORT = 8080
 HOME = $SERVICEHOME
 HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-hostlist
 OPTIONS = -p
 #SERVERS = http://v9.gnunet.org:58080/
@@ -293,7 +276,6 @@ AUTOSTART = YES
 PORT = 20003
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-core
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -327,7 +309,6 @@ AUTOSTART = YES
 PORT = 20001
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-statistics
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -340,7 +321,6 @@ AUTOSTART = YES
 PORT = 20000
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-dht
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -349,6 +329,16 @@ UNIXPATH = /tmp/test-service-dht-1
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
+[chat]
+UNIXPATH = /tmp/test-service-chat-b_server-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_server-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
 [dhtcache]
 DATABASE = sqlite
 QUOTA = 1 MB
@@ -360,4 +350,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 [lockmanager]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
+[consensus]
+AUTOSTART = NO
+
+