[GNUnet-SVN] r19077 - gnunet/src/integration-tests/confs

[gnunet]

Author: wachs
Date: 2012-01-10 16:54:49 +0100 (Tue, 10 Jan 2012)
New Revision: 19077

Modified:
   gnunet/src/integration-tests/confs/c_bootstrap_server.conf
   gnunet/src/integration-tests/confs/c_nat_client.conf
   gnunet/src/integration-tests/confs/c_no_nat_client.conf
Log:
added section to solve vpn conflicts


Modified: gnunet/src/integration-tests/confs/c_bootstrap_server.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_bootstrap_server.conf  2012-01-10 
15:13:41 UTC (rev 19076)
+++ gnunet/src/integration-tests/confs/c_bootstrap_server.conf  2012-01-10 
15:54:49 UTC (rev 19077)
@@ -6,6 +6,17 @@
 #HOSTKEY = $SERVICEHOME/.hostkey
 HOSTKEY = hostkeys/0000-hostkey 
 
+[vpn]
+AUTOSTART = YES
+PORT = 0
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dns
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-vpn-15
+
 [resolver]
 AUTOSTART = YES
 PORT = 20017

Modified: gnunet/src/integration-tests/confs/c_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_nat_client.conf        2012-01-10 
15:13:41 UTC (rev 19076)
+++ gnunet/src/integration-tests/confs/c_nat_client.conf        2012-01-10 
15:54:49 UTC (rev 19077)
@@ -8,7 +8,18 @@
 [client]
 HOME = $SERVICEHOME
 
+[vpn]
+AUTOSTART = YES
+PORT = 0
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dns
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-vpn-57
 
+
 [resolver]
 AUTOSTART = YES
 PORT = 20071

Modified: gnunet/src/integration-tests/confs/c_no_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client.conf     2012-01-10 
15:13:41 UTC (rev 19076)
+++ gnunet/src/integration-tests/confs/c_no_nat_client.conf     2012-01-10 
15:54:49 UTC (rev 19077)
@@ -6,6 +6,17 @@
 #HOSTKEY = $SERVICEHOME/.hostkey
 HOSTKEY = hostkeys/0001-hostkey 
 
+[vpn]
+AUTOSTART = YES
+PORT = 0
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dns
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-vpn-29
+
 [resolver]
 AUTOSTART = YES
 PORT = 20035