migrating towards XDG configuration specification (#3000)

3 files changed, 1 insertions, 5 deletions

diff --git a/src/testbed/gnunet-daemon-testbed-blacklist.c b/src/testbed/gnunet-daemon-testbed-blacklist.c
index 6be43999c..55cd35e10 100644
--- a/src/testbed/gnunet-daemon-testbed-blacklist.c
+++ b/src/testbed/gnunet-daemon-testbed-blacklist.c
@@ -215,7 +215,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   char fname[PATH_MAX];
 
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (c, "PATHS",
-                                                          "SERVICEHOME",
+                                                          "GNUNET_HOME",
                                                           &shome))
   {
     GNUNET_break (0);
diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in
index 5dd0dadcd..8255ba152 100644
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -52,9 +52,6 @@ USE_EPHEMERAL_KEYS = NO
 TIMEOUT = 300 s
 PORT = 12368
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
 [PATHS]
 SERVICEHOME = /tmp/test-testbed/
 
diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in
index 40bdae16d..108142d5e 100644
--- a/src/testbed/testbed.conf.in
+++ b/src/testbed/testbed.conf.in
@@ -2,7 +2,6 @@
 AUTOSTART = NO
 @JAVAPORT@ PORT = 2101
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = gnunet-service-testbed
 
 # How long should operations wait?