-getting rid of silly, stupid, useless, often wrong DEFAULTCONFIG setting

5 files changed, 2 insertions, 12 deletions

diff --git a/src/gns/gns-helper-service-w32.conf b/src/gns/gns-helper-service-w32.conf
index 2d01c8f9d..48652173a 100644
--- a/src/gns/gns-helper-service-w32.conf
+++ b/src/gns/gns-helper-service-w32.conf
@@ -1,5 +1,4 @@
 [gns-helper-service-w32]
-CONFIG = $DEFAULTCONFIG
 AUTOSTART = YES
 BINARY = gnunet-gns-helper-service-w32
 PORT = 5353
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index 91c0a4dc2..303fbf90b 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -2,7 +2,6 @@
 AUTOSTART = YES
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-gns
 UNIXPATH = /tmp/gnunet-service-gns.sock
 @UNIXONLY@PORT = 2102
@@ -26,6 +25,5 @@ HTTPPORT = 18080
 ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-gns-fcfsd
 
diff --git a/src/gns/test_gns_dht_default.conf b/src/gns/test_gns_dht_default.conf
index b2897509a..cca3b4338 100644
--- a/src/gns/test_gns_dht_default.conf
+++ b/src/gns/test_gns_dht_default.conf
@@ -1,7 +1,6 @@
 @INLINE@ test_gns_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-gns-dht/
-DEFAULTCONFIG = test_gns_dht_default.conf
 
 [transport-tcp]
 PORT = 22568
@@ -67,7 +66,6 @@ ZONEKEY =  $SERVICEHOME/.hostkey
 HIJACK_DNS = NO
 UNIXPATH = /tmp/gnunet-service-gns-default.sock
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 AUTO_IMPORT_PKEY = NO
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 10
@@ -81,7 +79,6 @@ UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-namestore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index 81ec9a713..b098edb60 100644
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -1,6 +1,5 @@
 [PATHS]
 SERVICEHOME = /tmp/gnunet-test-gns-proxy/
-DEFAULTCONFIG = test_gns_proxy.conf
 
 [transport]
 PLUGINS = tcp
@@ -16,7 +15,7 @@ HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [gns]
 AUTOSTART = YES
-ZONEKEY = $SERVICEHOME/hostkey
+ZONEKEY = $SERVICEHOME/.hostkey
 HIJACK_DNS = YES
 
 [gns-proxy]
@@ -29,4 +28,4 @@ AUTOSTART = YES
 [dns]
 PROVIDE_EXIT = NO
 #DNS_EXIT = 8.8.8.8
-#PREFIX = valgrind --leak-check=full
\ No newline at end of file
+#PREFIX = valgrind --leak-check=full
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf
index dcd47da96..8143eddca 100644
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -54,7 +54,6 @@ WEAKRANDOM = YES
 HOSTKEY = zonefiles/test_zonekey
 
 [PATHS]
-DEFAULTCONFIG = test_gns_simple_lookup.conf
 SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/
 
 
@@ -84,7 +83,6 @@ SHORTEN_ZONEKEY = zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0
 HIJACK_DNS = NO
 UNIXPATH = /tmp/gnunet-service-gns.sock
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15
@@ -104,7 +102,6 @@ UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-namestore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;