more work towards XDG spec (#3000) -- config file location

7 files changed, 8 insertions, 8 deletions

diff --git a/src/hostlist/hostlist.conf b/src/hostlist/hostlist.conf
index 40e7c7f7e..3c1bfa563 100644
--- a/src/hostlist/hostlist.conf
+++ b/src/hostlist/hostlist.conf
@@ -1,14 +1,14 @@
 [hostlist]
 # port for hostlist http server
 HTTPPORT = 8080
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
+HOSTLISTFILE = $GNUNET_CONFIG_HOME/hostlist/learned.txt
 BINARY = gnunet-daemon-hostlist
 # consider having "-e" as default as well once implemented
 OPTIONS = -b
 SERVERS = http://v10.gnunet.org/hostlist
 # http://ioerror.gnunet.org:65535/
 # proxy for downloading hostlists
-HTTP-PROXY = 
+HTTP-PROXY =
 # bind hostlist http server to a specific IPv4 or IPv6
 # BINDTOIP =
 
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 0a345f6bf..377ba4a41 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-1/
 
 [transport-tcp]
 PORT = 12968
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index c3833381a..547a9e2ff 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-2/
 
 [transport-tcp]
 PORT = 22968
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf
index a11097b8c..93308b4bd 100644
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/src/hostlist/test_hostlist_defaults.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist/
 
 [resolver]
 PORT = 12464
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index b08660a33..f65ba0ae5 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-1/
 
 [transport-tcp]
 PORT = 22968
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index 95de70530..db1a397f3 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-2/
 
 [transport-tcp]
 PORT = 12968
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index f70fbda5f..57cca3343 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-3/
 
 [transport-tcp]
 PORT = 32968