Merge remote-tracking branch 'origin/master' into credentials

[oweals/gnunet.git] / src / util / test_service_data.conf

diff --git a/src/util/test_service_data.conf b/src/util/test_service_data.conf
index d647ef8abc8c340cb0f57391d731fa86cab6e6cf..c04626b5bc68b7d999d13b6185ead6028595e0cc 100644 (file)
--- a/src/util/test_service_data.conf
+++ b/src/util/test_service_data.conf
@@ -2,7 +2,6 @@
 PORT=12435
 BINDTO=localhost
 PIDFILE=/tmp/test-service.pid
-TIMEOUT=30000
 MAXBUF=1024
 DISABLEV6=NO
 ACCEPT_FROM=127.0.0.1;
@@ -10,12 +9,11 @@ REJECT_FROM=1.2.3.0/15;4.5.0.0/8;6.7.8.9/255.255.255.0;
 ACCEPT_FROM6=::1;
 REJECT_FROM6=AB:CD:EF::00;AB:CD::00/40;
 HOSTNAME=localhost
-USE_LOCALADDR = YES 
 
 [test_service6]
 PORT=12435
 PIDFILE=/tmp/test-service.pid
-TIMEOUT=30000
+TIMEOUT=30 s
 MAXBUF=1024
 DISABLEV6=NO
 ACCEPT_FROM=127.0.0.1;
@@ -26,3 +24,5 @@ HOSTNAME=::1
 
 [resolver]
 HOSTNAME=localhost
+
+