X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgns%2Ftest_gns_simple_lookup.conf;h=77ee8fc18621b3206105e861c65aeeb71b238955;hb=ecfab268bb34efb1305bf5b7894db47cd916a6a7;hp=96ad5ed3f7db0bd77065ef4049ffe75439a824a0;hpb=9c336a18f9ce923225085215ea3d8b13464514d6;p=oweals%2Fgnunet.git

diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf
index 96ad5ed3f..77ee8fc18 100644
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -1,29 +1,25 @@
+@INLINE@ test_gns_defaults.conf
 [fs]
 AUTOSTART = NO
 
 [resolver]
-AUTOSTART = NO
+AUTOSTART = YES
 HOSTNAME = localhost
 
 [dht]
-DEBUG = NO
 AUTOSTART = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
-PORT = 2100
+PORT = 12100
 BINARY = gnunet-service-dht
 
-[block]
-plugins = dht test gns
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
 PLUGINS = tcp
-DEBUG = NO
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
@@ -37,24 +33,15 @@ WAN_QUOTA_OUT = 1 GB
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = core dht namestore gns
 PORT = 12366
-DEBUG = NO
 
 [transport-tcp]
 TIMEOUT = 300 s
 PORT = 12368
 BINDTO = 127.0.0.1
 
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
 [PATHS]
-DEFAULTCONFIG = test_gns_simple_lookup.conf
-SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-gns-peer-1/
 
 
 [nat]
@@ -71,18 +58,40 @@ AUTOSTART = YES
 DNS_EXIT = 8.8.8.8
 
 [gns]
-PREFIX = valgrind -v --leak-check=full --track-origins=yes 
+#PREFIX = valgrind --leak-check=full --track-origins=yes
 AUTOSTART = YES
 BINARY = gnunet-service-gns
-ZONEKEY = zonekey
+ZONEKEY = zonefiles/test_zonekey
+PRIVATE_ZONE = private
+PRIVATE_ZONEKEY = zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
+SHORTEN_ZONE = short
+SHORTEN_ZONEKEY = zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
+#ZONEKEY =  $GNUNET_TEST_HOME/gns/zonekey.zkey
 HIJACK_DNS = NO
-UNIXPATH = /tmp/gnunet-service-gns.sock
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-
-
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-gns.sock
+AUTO_IMPORT_PKEY = YES
+MAX_PARALLEL_BACKGROUND_QUERIES = 10
+DEFAULT_LOOKUP_TIMEOUT = 15 s
+RECORD_PUT_INTERVAL = 1 h
 
 [nse]
 AUTOSTART = NO
 
+[statistics]
+AUTOSTART = NO
+
+[namestore]
+PORT = 22371
+AUTOSTART = YES
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore-default.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+HOSTNAME = localhost
+BINARY = gnunet-service-namestore
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+DATABASE = sqlite
+ZONEFILE_DIRECTORY = $GNUNET_TEST_HOME
 
+[namestore-sqlite]
+FILENAME = $GNUNET_TEST_HOME/sqlite-default.db