moving away from DEFAULTSERVICES to per-section FORCESTART, thus addressing #3565 indirectly

9 files changed, 5 insertions, 82 deletions

diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 5d5a94b5d..3a68ed051 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -4,8 +4,6 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
-dist_pkgcfg_DATA = \
-  hostlist.conf
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
@@ -22,12 +20,16 @@ libexec_PROGRAMS = \
  gnunet-daemon-hostlist
 LIB_GNURL=@LIBGNURL@
 CPP_GNURL=@LIBGNURL_CPPFLAGS@
+dist_pkgcfg_DATA = \
+  hostlist.conf
 else
 if HAVE_LIBCURL
 libexec_PROGRAMS = \
  gnunet-daemon-hostlist
 LIB_GNURL=@LIBCURL@
 CPP_GNURL=@LIBCURL_CPPFLAGS@
+dist_pkgcfg_DATA = \
+  hostlist.conf
 endif
 endif
 
diff --git a/src/hostlist/hostlist.conf b/src/hostlist/hostlist.conf
index 79acb3900..5c4a86b43 100644
--- a/src/hostlist/hostlist.conf
+++ b/src/hostlist/hostlist.conf
@@ -1,4 +1,5 @@
 [hostlist]
+FORCESTART = YES
 BINARY = gnunet-daemon-hostlist
 
 # port for hostlist http server
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_data.conf b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
index 74d16be89..9f853c244 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_data.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
@@ -4,7 +4,6 @@ PORT = 12968
 
 [arm]
 PORT = 12966
-DEFAULTSERVICES = hostlist topology
 
 [statistics]
 PORT = 12967
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 0d59325aa..4fc4e8dd1 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -7,7 +7,6 @@ PORT = 12968
 
 [arm]
 PORT = 12966
-DEFAULTSERVICES = hostlist topology
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index f3fca70a2..538a91602 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -7,7 +7,6 @@ PORT = 22968
 
 [arm]
 PORT = 22966
-DEFAULTSERVICES = hostlist topology
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf
index b3eb87a2d..d5084692f 100644
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/src/hostlist/test_hostlist_defaults.conf
@@ -1,89 +1,15 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist/
 
-[resolver]
-PORT = 12464
-
 [transport]
-PORT = 12465
 PLUGINS = tcp
 
-[arm]
-PORT = 12466
-DEFAULTSERVICES = hostlist
-
-[statistics]
-PORT = 12467
-
-[tcp]
-PORT = 12468
-
 [peerinfo]
-PORT = 12469
 NO_IO = YES
 
 [core]
 PORT = 12470
 
-[testing]
-WEAKRANDOM = YES
-
-[hostlist]
-HTTP-PROXY =
-
-[cadet]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[revocation]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[namecache]
-AUTOSTART = NO
-
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
 
-[consensus]
-AUTOSTART = NO
-
-[regex]
-AUTOSTART = NO
-
-[identity]
-AUTOSTART = NO
-
-[conversation]
-AUTOSTART = NO
-
-[psycstore]
-AUTOSTART = NO
-
-[set]
-AUTOSTART = NO
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index 1bdcd8101..12087a7b7 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -7,7 +7,6 @@ PORT = 22968
 
 [arm]
 PORT = 22966
-DEFAULTSERVICES = topology hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-arm.sock
 
 [statistics]
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index afe3ef69a..44415aa49 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -7,7 +7,6 @@ PORT = 12968
 
 [arm]
 PORT = 12966
-DEFAULTSERVICES = topology hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-arm.sock
 
 [statistics]
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index dc27bfb9a..f72790a45 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -7,7 +7,6 @@ PORT = 32968
 
 [arm]
 PORT = 32966
-DEFAULTSERVICES = topology hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-arm.sock
 
 [statistics]