-indent, doxygen

[oweals/gnunet.git] / src / nat / test_nat_data.conf

diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf
index c312c69fb453b63c6f6182ad18c55d40d64294be..42c1399cf43ef9d5a9d1d8ec54940b6c5b12bb80 100644 (file)
--- a/src/nat/test_nat_data.conf
+++ b/src/nat/test_nat_data.conf
@@ -1,19 +1,16 @@
 [PATHS]
-SERVICEHOME = /tmp/nat-test
-# SERVICEHOME = /var/lib/gnunet/
-# DEFAULTCONFIG = /etc/gnunet.conf
-# If 'DEFAULTCONFIG' is not defined, the current
+GNUNET_TEST_HOME = /tmp/nat-test
+# GNUNET_TEST_HOME = /var/lib/gnunet/
 # configuration file is assumed to be the default,
 # which is what we want by default...
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [TESTING]
 WEAKRANDOM = NO
 
 [client]
-HOME = $SERVICEHOME
 
 
 [nat]
@@ -36,8 +33,8 @@ USE_LOCALADDR = YES
 
 # Should we use ICMP-based NAT traversal to try connect to NATed peers
 # or, if we are behind NAT, to allow connections to us?
-ENABLE_ICMP_CLIENT = YES
-ENABLE_ICMP_SERVER = YES
+ENABLE_ICMP_CLIENT = NO
+ENABLE_ICMP_SERVER = NO
 
 # IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
 # normal interface IP address for non-NATed peers; 
@@ -50,16 +47,14 @@ DISABLEV6 = NO
 [arm]
 PORT = 2087
 HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 DEFAULTSERVICES = topology hostlist
-UNIXPATH = /tmp/gnunet-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-arm.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
-# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
+# GLOBAL_POSTFIX = -l $GNUNET_TEST_HOME/{}-logs
 # GLOBAL_PREFIX =
 # USERNAME =
 # MAXBUF =
@@ -74,12 +69,10 @@ UNIX_MATCH_GID = YES
 AUTOSTART = YES
 PORT = 2088
 HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-statistics
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
 # DISABLE_SOCKET_FORWARDING = NO
@@ -96,12 +89,10 @@ UNIX_MATCH_GID = YES
 AUTOSTART = YES
 PORT = 2089
 HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-resolver
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = NO
 # DISABLE_SOCKET_FORWARDING = NO
@@ -132,5 +123,12 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-[mesh]
+[cadet]
+AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO
+
+
+[consensus]
 AUTOSTART = NO