- fixes, intendation

[oweals/gnunet.git] / src / gns / test_gns_simple_lookup.conf

diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf
index f759ba448c97af47aef603e0a9ca05609977caf4..77ee8fc18621b3206105e861c65aeeb71b238955 100644 (file)
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -14,12 +14,9 @@ HOSTNAME = localhost
 PORT = 12100
 BINARY = gnunet-service-dht
 
-[block]
-plugins = dht test gns
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
@@ -36,7 +33,6 @@ WAN_QUOTA_OUT = 1 GB
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = core dht namestore gns
 PORT = 12366
 
 [transport-tcp]
@@ -44,14 +40,8 @@ TIMEOUT = 300 s
 PORT = 12368
 BINDTO = 127.0.0.1
 
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = zonefiles/test_zonekey
-
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-gns-peer-1/
 
 
 [nat]
@@ -68,7 +58,7 @@ AUTOSTART = YES
 DNS_EXIT = 8.8.8.8
 
 [gns]
-#PREFIX = valgrind --leak-check=full --track-origins=yes 
+#PREFIX = valgrind --leak-check=full --track-origins=yes
 AUTOSTART = YES
 BINARY = gnunet-service-gns
 ZONEKEY = zonefiles/test_zonekey
@@ -76,10 +66,9 @@ PRIVATE_ZONE = private
 PRIVATE_ZONEKEY = zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
 SHORTEN_ZONE = short
 SHORTEN_ZONEKEY = zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
-#ZONEKEY =  $SERVICEHOME/gns/zonekey.zkey
+#ZONEKEY =  $GNUNET_TEST_HOME/gns/zonekey.zkey
 HIJACK_DNS = NO
-UNIXPATH = /tmp/gnunet-service-gns.sock
-HOME = $SERVICEHOME
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-gns.sock
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s
@@ -94,16 +83,15 @@ AUTOSTART = NO
 [namestore]
 PORT = 22371
 AUTOSTART = YES
-UNIXPATH = /tmp/gnunet-service-namestore-default.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore-default.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = gnunet-service-namestore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 DATABASE = sqlite
-ZONEFILE_DIRECTORY = $SERVICEHOME
+ZONEFILE_DIRECTORY = $GNUNET_TEST_HOME
 
 [namestore-sqlite]
-FILENAME = $SERVICEHOME/sqlite-default.db
+FILENAME = $GNUNET_TEST_HOME/sqlite-default.db