summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-10-09 18:38:01 +0000
committerChristian Grothoff <christian@grothoff.org>2012-10-09 18:38:01 +0000
commitb581097addc91044432dcb54ce7cff26b9e12de1 (patch)
treedafeebf08b90707d2cbfb6f5ab75c361ba298d6e
parent81dcb0a35beb7c862ac6f2677933b978aab67038 (diff)
-getting rid of silly, stupid, useless, often wrong DEFAULTCONFIG setting
-rw-r--r--src/arm/arm.conf.in1
-rw-r--r--src/arm/test_arm_api_data.conf2
-rw-r--r--src/ats-test/test_transport_ats_1addr.conf1
-rw-r--r--src/ats-test/test_transport_ats_2addr.conf1
-rw-r--r--src/ats-test/test_transport_ats_4addr.conf1
-rw-r--r--src/ats/ats.conf.in1
-rw-r--r--src/ats/test_ats_api.conf1
-rw-r--r--src/chat/chat.conf.in1
-rw-r--r--src/chat/test_chat_data.conf2
-rw-r--r--src/chat/test_chat_peer1.conf3
-rw-r--r--src/chat/test_chat_peer2.conf3
-rw-r--r--src/chat/test_chat_peer3.conf3
-rw-r--r--src/core/core.conf.in1
-rw-r--r--src/core/test_core_api_data.conf1
-rw-r--r--src/core/test_core_api_peer1.conf1
-rw-r--r--src/core/test_core_api_peer2.conf3
-rw-r--r--src/core/test_core_api_send_to_self.conf2
-rw-r--r--src/core/test_core_defaults.conf1
-rw-r--r--src/core/test_core_quota_asymmetric_recv_limited_peer1.conf1
-rw-r--r--src/core/test_core_quota_asymmetric_recv_limited_peer2.conf3
-rw-r--r--src/core/test_core_quota_asymmetric_send_limit_peer1.conf1
-rw-r--r--src/core/test_core_quota_asymmetric_send_limit_peer2.conf3
-rw-r--r--src/core/test_core_quota_peer1.conf1
-rw-r--r--src/core/test_core_quota_peer2.conf3
-rw-r--r--src/datastore/datastore.conf.in1
-rw-r--r--src/datastore/perf_plugin_datastore_data_mysql.conf1
-rw-r--r--src/datastore/perf_plugin_datastore_data_postgres.conf1
-rw-r--r--src/datastore/perf_plugin_datastore_data_sqlite.conf1
-rw-r--r--src/datastore/test_datastore_api_data_mysql.conf1
-rw-r--r--src/datastore/test_datastore_api_data_postgres.conf1
-rw-r--r--src/datastore/test_datastore_api_data_sqlite.conf1
-rw-r--r--src/datastore/test_plugin_datastore_data_mysql.conf1
-rw-r--r--src/datastore/test_plugin_datastore_data_postgres.conf1
-rw-r--r--src/datastore/test_plugin_datastore_data_sqlite.conf1
-rw-r--r--src/dht/dht.conf.in1
-rw-r--r--src/dht/test_dht_2dtorus.conf1
-rw-r--r--src/dht/test_dht_api_data.conf1
-rw-r--r--src/dht/test_dht_api_peer1.conf1
-rw-r--r--src/dht/test_dht_line.conf1
-rw-r--r--src/dht/test_dht_multipeer_data.conf5
-rw-r--r--src/dht/test_dht_twopeer_data.conf1
-rw-r--r--src/dns/dns.conf.in1
-rw-r--r--src/dv/dv.conf.in1
-rw-r--r--src/dv/test_transport_dv_data.conf2
-rw-r--r--src/exit/exit.conf1
-rw-r--r--src/fs/fs.conf.in2
-rw-r--r--src/fs/test_fs_data.conf1
-rw-r--r--src/fs/test_fs_defaults.conf1
-rw-r--r--src/fs/test_fs_download_data.conf1
-rw-r--r--src/fs/test_fs_file_information_data.conf1
-rw-r--r--src/fs/test_fs_list_indexed_data.conf1
-rw-r--r--src/fs/test_fs_namespace_data.conf1
-rw-r--r--src/fs/test_fs_publish_data.conf1
-rw-r--r--src/fs/test_fs_search_data.conf1
-rw-r--r--src/fs/test_fs_unindex_data.conf1
-rw-r--r--src/fs/test_gnunet_fs_idx_data.conf1
-rw-r--r--src/fs/test_gnunet_fs_ns_data.conf1
-rw-r--r--src/fs/test_gnunet_fs_psd_data.conf1
-rw-r--r--src/fs/test_gnunet_fs_rec_data.conf1
-rw-r--r--src/fs/test_gnunet_service_fs_migration_data.conf1
-rw-r--r--src/gns/gns-helper-service-w32.conf1
-rw-r--r--src/gns/gns.conf.in2
-rw-r--r--src/gns/test_gns_dht_default.conf3
-rw-r--r--src/gns/test_gns_proxy.conf5
-rw-r--r--src/gns/test_gns_simple_lookup.conf3
-rw-r--r--src/hostlist/hostlist.conf1
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_peer1.conf1
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_peer2.conf1
-rw-r--r--src/hostlist/test_hostlist_defaults.conf1
-rw-r--r--src/hostlist/test_learning_adv_peer.conf1
-rw-r--r--src/hostlist/test_learning_learn_peer.conf1
-rw-r--r--src/hostlist/test_learning_learn_peer2.conf1
-rw-r--r--src/integration-tests/confs/c_bootstrap_server.conf22
-rw-r--r--src/integration-tests/confs/c_bootstrap_server_w_massif.conf20
-rw-r--r--src/integration-tests/confs/c_nat_client.conf20
-rw-r--r--src/integration-tests/confs/c_no_nat_client.conf20
-rw-r--r--src/integration-tests/confs/c_no_nat_client_2.conf19
-rw-r--r--src/integration-tests/confs/c_no_nat_client_http.conf20
-rw-r--r--src/integration-tests/confs/c_no_nat_client_http_2.conf19
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix.conf20
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix_2.conf19
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp.conf20
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp.conf22
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp_http.conf22
-rw-r--r--src/lockmanager/lockmanager.conf.in1
-rw-r--r--src/lockmanager/test_lockmanager_api.conf1
-rw-r--r--src/mesh/mesh.conf.in1
-rw-r--r--src/mesh/test_mesh.conf1
-rw-r--r--src/mesh/test_mesh_2dtorus.conf1
-rw-r--r--src/mesh/test_mesh_path.conf1
-rw-r--r--src/mesh/test_mesh_small.conf1
-rw-r--r--src/namestore/namestore.conf.in1
-rw-r--r--src/namestore/test_namestore_api.conf1
-rw-r--r--src/nat/test_nat_data.conf5
-rw-r--r--src/nat/test_nat_test_data.conf2
-rw-r--r--src/nse/nse.conf.in1
-rw-r--r--src/nse/nse_profiler_test.conf2
-rw-r--r--src/nse/test_nse.conf2
-rw-r--r--src/peerinfo/peerinfo.conf.in1
-rw-r--r--src/pt/pt.conf1
-rw-r--r--src/pt/test_gns_vpn.conf2
-rw-r--r--src/pt/test_gnunet_vpn.conf1
-rw-r--r--src/regex/test_regex_big.conf1
-rw-r--r--src/statistics/statistics.conf.in1
-rw-r--r--src/statistics/test_statistics_api_data.conf1
-rw-r--r--src/stream/test_stream_local.conf1
-rw-r--r--src/template/template.conf1
-rw-r--r--src/testbed/test_testbed_api.conf1
-rw-r--r--src/testbed/testbed.conf.in3
-rw-r--r--src/testing/test_testing_defaults.conf1
-rw-r--r--src/testing_old/test_testing_2dtorus.conf1
-rw-r--r--src/testing_old/test_testing_connect_peer1.conf1
-rw-r--r--src/testing_old/test_testing_connect_peer2.conf1
-rw-r--r--src/testing_old/test_testing_data.conf1
-rw-r--r--src/testing_old/test_testing_data_remote.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_2d_torus.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_blacklist.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_churn.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_clique.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_clique_dfs.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_clique_minimum.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_clique_random.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_erdos_renyi.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_internat.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_none.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_ring.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_scale_free.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_small_world_ring.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_small_world_torus.conf1
-rw-r--r--src/testing_old/test_testing_data_topology_stability.conf1
-rw-r--r--src/testing_old/test_testing_defaults.conf1
-rw-r--r--src/testing_old/test_testing_peergroup_data.conf1
-rw-r--r--src/topology/topology.conf1
-rw-r--r--src/transport/template_cfg_peer1.conf1
-rw-r--r--src/transport/template_cfg_peer2.conf1
-rw-r--r--src/transport/test_plugin_transport_data.conf1
-rw-r--r--src/transport/test_quota_compliance_data.conf1
-rw-r--r--src/transport/test_quota_compliance_http_asymmetric_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_http_asymmetric_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_http_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_http_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_https_asymmetric_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_https_asymmetric_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_https_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_https_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_tcp_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_tcp_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_udp_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_udp_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_unix_asymmetric_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_unix_asymmetric_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_unix_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_unix_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf1
-rw-r--r--src/transport/test_quota_compliance_wlan_peer1.conf1
-rw-r--r--src/transport/test_quota_compliance_wlan_peer2.conf1
-rw-r--r--src/transport/test_transport_api_bidirectional_connect_peer1.conf3
-rw-r--r--src/transport/test_transport_api_bidirectional_connect_peer2.conf3
-rw-r--r--src/transport/test_transport_api_data.conf1
-rw-r--r--src/transport/test_transport_api_disconnect_tcp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_disconnect_tcp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_http_peer1.conf1
-rw-r--r--src/transport/test_transport_api_http_peer2.conf1
-rw-r--r--src/transport/test_transport_api_http_reverse_peer1.conf1
-rw-r--r--src/transport/test_transport_api_http_reverse_peer2.conf1
-rw-r--r--src/transport/test_transport_api_https_peer1.conf1
-rw-r--r--src/transport/test_transport_api_https_peer2.conf1
-rw-r--r--src/transport/test_transport_api_limited_sockets_tcp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_limited_sockets_tcp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_multi_peer1.conf1
-rw-r--r--src/transport/test_transport_api_multi_peer2.conf1
-rw-r--r--src/transport/test_transport_api_reliability_http_peer1.conf1
-rw-r--r--src/transport/test_transport_api_reliability_http_peer2.conf1
-rw-r--r--src/transport/test_transport_api_reliability_https_peer1.conf1
-rw-r--r--src/transport/test_transport_api_reliability_https_peer2.conf1
-rw-r--r--src/transport/test_transport_api_reliability_tcp_nat_peer1.conf1
-rw-r--r--src/transport/test_transport_api_reliability_tcp_nat_peer2.conf1
-rw-r--r--src/transport/test_transport_api_reliability_tcp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_reliability_tcp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_reliability_wlan_peer1.conf1
-rw-r--r--src/transport/test_transport_api_reliability_wlan_peer2.conf1
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer1.conf1
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer2.conf1
-rw-r--r--src/transport/test_transport_api_tcp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_tcp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_timeout_http_peer1.conf1
-rw-r--r--src/transport/test_transport_api_timeout_http_peer2.conf1
-rw-r--r--src/transport/test_transport_api_timeout_https_peer1.conf1
-rw-r--r--src/transport/test_transport_api_timeout_https_peer2.conf1
-rw-r--r--src/transport/test_transport_api_timeout_tcp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_timeout_tcp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_timeout_udp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_timeout_udp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_timeout_unix_peer1.conf1
-rw-r--r--src/transport/test_transport_api_timeout_unix_peer2.conf1
-rw-r--r--src/transport/test_transport_api_udp_nat_peer1.conf1
-rw-r--r--src/transport/test_transport_api_udp_nat_peer2.conf1
-rw-r--r--src/transport/test_transport_api_udp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_udp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_unix_peer1.conf1
-rw-r--r--src/transport/test_transport_api_unix_peer2.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_constant_udp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_constant_udp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_udp_peer1.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_udp_peer2.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_unix_peer1.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_unix_peer2.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_wlan_peer1.conf1
-rw-r--r--src/transport/test_transport_api_unreliability_wlan_peer2.conf1
-rw-r--r--src/transport/test_transport_api_wlan_peer1.conf1
-rw-r--r--src/transport/test_transport_api_wlan_peer2.conf1
-rw-r--r--src/transport/test_transport_defaults.conf1
-rw-r--r--src/transport/test_transport_startonly.conf1
-rw-r--r--src/transport/transport.conf.in1
-rw-r--r--src/util/resolver.conf.in1
-rw-r--r--src/util/util.conf2
-rw-r--r--src/vpn/vpn.conf.in1
220 files changed, 13 insertions, 485 deletions
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index 316f0e49a..e7620b8ff 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -3,7 +3,6 @@
@UNIXONLY@ PORT = 2087
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index 7d56e65fc..cbadc47d2 100644
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunetd-arm/
-DEFAULTCONFIG = test_arm_api_data.conf
[arm]
PORT = 23354
@@ -21,7 +20,6 @@ AUTOSTART = NO
PORT = 2223
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = mockup-service
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/ats-test/test_transport_ats_1addr.conf b/src/ats-test/test_transport_ats_1addr.conf
index e01f743d2..311e5f00d 100644
--- a/src/ats-test/test_transport_ats_1addr.conf
+++ b/src/ats-test/test_transport_ats_1addr.conf
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing/
-DEFAULTCONFIG = test_testing_data.conf
[TESTING]
HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
diff --git a/src/ats-test/test_transport_ats_2addr.conf b/src/ats-test/test_transport_ats_2addr.conf
index ce7d104ae..0571dbf21 100644
--- a/src/ats-test/test_transport_ats_2addr.conf
+++ b/src/ats-test/test_transport_ats_2addr.conf
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing/
-DEFAULTCONFIG = test_testing_data.conf
[TESTING]
HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
diff --git a/src/ats-test/test_transport_ats_4addr.conf b/src/ats-test/test_transport_ats_4addr.conf
index cd224e6b0..e4b4863b3 100644
--- a/src/ats-test/test_transport_ats_4addr.conf
+++ b/src/ats-test/test_transport_ats_4addr.conf
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing/
-DEFAULTCONFIG = test_testing_data.conf
[TESTING]
HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in
index f81016e2b..d99708174 100644
--- a/src/ats/ats.conf.in
+++ b/src/ats/ats.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
@UNIXONLY@ PORT = 2098
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/ats/test_ats_api.conf b/src/ats/test_ats_api.conf
index efd7fc9c6..ab96f655e 100644
--- a/src/ats/test_ats_api.conf
+++ b/src/ats/test_ats_api.conf
@@ -13,7 +13,6 @@ AUTOSTART = YES
PORT = 12002
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/chat/chat.conf.in b/src/chat/chat.conf.in
index 41fe9b4f7..560931e67 100644
--- a/src/chat/chat.conf.in
+++ b/src/chat/chat.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
@UNIXONLY@ PORT = 2090
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-chat
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/chat/test_chat_data.conf b/src/chat/test_chat_data.conf
index 3052a4f55..77446151b 100644
--- a/src/chat/test_chat_data.conf
+++ b/src/chat/test_chat_data.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-chat/
-DEFAULTCONFIG = test_chat_data.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
@@ -30,7 +29,6 @@ HOSTNAME = localhost
PORT = 42471
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-chat
[testing]
diff --git a/src/chat/test_chat_peer1.conf b/src/chat/test_chat_peer1.conf
index 73280da0d..0193188de 100644
--- a/src/chat/test_chat_peer1.conf
+++ b/src/chat/test_chat_peer1.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-chat-peer-1/
-DEFAULTCONFIG = test_chat_peer1.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
@@ -41,7 +40,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[peerinfo]
@@ -58,7 +56,6 @@ UNIXPATH = /tmp/gnunet-chat-p1-service-statistics.sock
PORT = 31008
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-chat
[testing]
diff --git a/src/chat/test_chat_peer2.conf b/src/chat/test_chat_peer2.conf
index 00808b5b5..c4a31a0f3 100644
--- a/src/chat/test_chat_peer2.conf
+++ b/src/chat/test_chat_peer2.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-chat-peer-2/
-DEFAULTCONFIG = test_chat_peer2.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
@@ -41,7 +40,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[peerinfo]
@@ -58,7 +56,6 @@ UNIXPATH = /tmp/gnunet-chat-p2-service-statistics.sock
PORT = 32008
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-chat
[testing]
diff --git a/src/chat/test_chat_peer3.conf b/src/chat/test_chat_peer3.conf
index a39452323..d8dcedc29 100644
--- a/src/chat/test_chat_peer3.conf
+++ b/src/chat/test_chat_peer3.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-chat-peer-3/
-DEFAULTCONFIG = test_chat_peer3.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
@@ -41,7 +40,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[peerinfo]
@@ -58,7 +56,6 @@ UNIXPATH = /tmp/gnunet-chat-p3-service-statistics.sock
PORT = 33008
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-chat
[testing]
diff --git a/src/core/core.conf.in b/src/core/core.conf.in
index 61ac84e6c..fbe2f7948 100644
--- a/src/core/core.conf.in
+++ b/src/core/core.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
@JAVAPORT@PORT = 2092
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/core/test_core_api_data.conf b/src/core/test_core_api_data.conf
index 30eea2dd5..440dac5c9 100644
--- a/src/core/test_core_api_data.conf
+++ b/src/core/test_core_api_data.conf
@@ -1,6 +1,5 @@
@INLINE@ test_core_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_core_api_data.conf
[arm]
DEFAULTSERVICES = topology hostlist
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index 662318a44..119354c84 100644
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-peer-1/
-DEFAULTCONFIG = test_core_api_peer1.conf
[transport-tcp]
PORT = 12468
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index cd29e3f94..e66c74c94 100644
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-peer-2/
-DEFAULTCONFIG = test_core_api_peer2.conf
[arm]
PORT = 22460
@@ -38,4 +37,4 @@ PORT = 22467
PORT = 22468
[transport-http]
-PORT = 22469 \ No newline at end of file
+PORT = 22469
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf
index 673772685..704a2b6da 100644
--- a/src/core/test_core_api_send_to_self.conf
+++ b/src/core/test_core_api_send_to_self.conf
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = ~/.gnunet/
-DEFAULTCONFIG = test_core_api_send_to_self.conf
[arm]
PORT = 2425
@@ -22,7 +21,6 @@ AUTOSTART = YES
PORT = 9252
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = test_core_api_send_to_self
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf
index 9525ca258..25a682445 100644
--- a/src/core/test_core_defaults.conf
+++ b/src/core/test_core_defaults.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core/
-DEFAULTCONFIG = test_core_defaults.conf
[arm]
DEFAULTSERVICES =
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
index 5501fb826..dcd886280 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/
-DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer1.conf
[transport-tcp]
PORT = 12488
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
index 62fc69e26..13f29e91a 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/
-DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer2.conf
[arm]
@@ -42,4 +41,4 @@ PORT = 22467
PORT = 22468
[transport-http]
-PORT = 22469 \ No newline at end of file
+PORT = 22469
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
index 568cf6b16..09c4ed049 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/
-DEFAULTCONFIG = test_core_quota_asymmetric_send_limit_peer1.conf
[transport-tcp]
PORT = 12488
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
index 614358ba7..03d5bce12 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/
-DEFAULTCONFIG = test_core_quota_asymmetric_send_limit_peer2.conf
[arm]
PORT = 22486
@@ -41,4 +40,4 @@ PORT = 22467
PORT = 22468
[transport-http]
-PORT = 22469 \ No newline at end of file
+PORT = 22469
diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf
index 4ff2ee44a..4a67bfe66 100644
--- a/src/core/test_core_quota_peer1.conf
+++ b/src/core/test_core_quota_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-1/
-DEFAULTCONFIG = test_core_quota_peer1.conf
[transport-tcp]
PORT = 12468
diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf
index 1fd4ec82b..e288da064 100644
--- a/src/core/test_core_quota_peer2.conf
+++ b/src/core/test_core_quota_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-2/
-DEFAULTCONFIG = test_core_quota_peer2.conf
[arm]
PORT = 22476
@@ -41,4 +40,4 @@ PORT = 22467
PORT = 22468
[transport-http]
-PORT = 22469 \ No newline at end of file
+PORT = 22469
diff --git a/src/datastore/datastore.conf.in b/src/datastore/datastore.conf.in
index 8cdb7b739..4149417de 100644
--- a/src/datastore/datastore.conf.in
+++ b/src/datastore/datastore.conf.in
@@ -6,7 +6,6 @@ UNIX_MATCH_GID = YES
@UNIXONLY@ PORT = 2093
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/datastore/perf_plugin_datastore_data_mysql.conf b/src/datastore/perf_plugin_datastore_data_mysql.conf
index dd26512e9..006b146af 100644
--- a/src/datastore/perf_plugin_datastore_data_mysql.conf
+++ b/src/datastore/perf_plugin_datastore_data_mysql.conf
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/perf-gnunet-datastore-mysql/
-DEFAULTCONFIG = perf_plugin_datastore_data_mysql.conf
[datastore]
DATABASE = mysql
diff --git a/src/datastore/perf_plugin_datastore_data_postgres.conf b/src/datastore/perf_plugin_datastore_data_postgres.conf
index 53ce6cfc9..052fa486e 100644
--- a/src/datastore/perf_plugin_datastore_data_postgres.conf
+++ b/src/datastore/perf_plugin_datastore_data_postgres.conf
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/perf-gnunet-datastore-postgres/
-DEFAULTCONFIG = perf_plugin_datastore_data_postgres.conf
[datastore]
DATABASE = postgres
diff --git a/src/datastore/perf_plugin_datastore_data_sqlite.conf b/src/datastore/perf_plugin_datastore_data_sqlite.conf
index 241d85efc..5f97597d6 100644
--- a/src/datastore/perf_plugin_datastore_data_sqlite.conf
+++ b/src/datastore/perf_plugin_datastore_data_sqlite.conf
@@ -1,5 +1,4 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/perf-gnunet-datastore-sqlite/
-DEFAULTCONFIG = perf_plugin_datastore_data_sqlite.conf
diff --git a/src/datastore/test_datastore_api_data_mysql.conf b/src/datastore/test_datastore_api_data_mysql.conf
index 8e5a3dc0d..92967b976 100644
--- a/src/datastore/test_datastore_api_data_mysql.conf
+++ b/src/datastore/test_datastore_api_data_mysql.conf
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-mysql/
-DEFAULTCONFIG = test_datastore_api_data_mysql.conf
[TESTING]
WEAKRANDOM = YES
diff --git a/src/datastore/test_datastore_api_data_postgres.conf b/src/datastore/test_datastore_api_data_postgres.conf
index 046c561f4..a1a21689b 100644
--- a/src/datastore/test_datastore_api_data_postgres.conf
+++ b/src/datastore/test_datastore_api_data_postgres.conf
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-postgres/
-DEFAULTCONFIG = test_datastore_api_data_postgres.conf
[TESTING]
WEAKRANDOM = YES
diff --git a/src/datastore/test_datastore_api_data_sqlite.conf b/src/datastore/test_datastore_api_data_sqlite.conf
index a743b8008..953aef248 100644
--- a/src/datastore/test_datastore_api_data_sqlite.conf
+++ b/src/datastore/test_datastore_api_data_sqlite.conf
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/
-DEFAULTCONFIG = test_datastore_api_data_sqlite.conf
[TESTING]
WEAKRANDOM = YES
diff --git a/src/datastore/test_plugin_datastore_data_mysql.conf b/src/datastore/test_plugin_datastore_data_mysql.conf
index 957818ad8..845454b12 100644
--- a/src/datastore/test_plugin_datastore_data_mysql.conf
+++ b/src/datastore/test_plugin_datastore_data_mysql.conf
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-plugin-mysql/
-DEFAULTCONFIG = test_plugin_datastore_data_mysql.conf
[datastore]
DATABASE = mysql
diff --git a/src/datastore/test_plugin_datastore_data_postgres.conf b/src/datastore/test_plugin_datastore_data_postgres.conf
index d79649663..8b8523d40 100644
--- a/src/datastore/test_plugin_datastore_data_postgres.conf
+++ b/src/datastore/test_plugin_datastore_data_postgres.conf
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-plugin-postgres/
-DEFAULTCONFIG = test_plugin_datastore_data_postgres.conf
[datastore]
DATABASE = postgres
diff --git a/src/datastore/test_plugin_datastore_data_sqlite.conf b/src/datastore/test_plugin_datastore_data_sqlite.conf
index f1fcf5f7f..dcdea7dde 100644
--- a/src/datastore/test_plugin_datastore_data_sqlite.conf
+++ b/src/datastore/test_plugin_datastore_data_sqlite.conf
@@ -1,5 +1,4 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-plugin-sqlite/
-DEFAULTCONFIG = test_plugin_datastore_data_sqlite.conf
diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in
index 36af99895..bcc0192ab 100644
--- a/src/dht/dht.conf.in
+++ b/src/dht/dht.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
@JAVAPORT@PORT = 2095
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index 82b930188..fa8c25011 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test_dht_topo/
-DEFAULTCONFIG = test_dht_2dtours.conf
[arm]
PORT = 10010
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 8d4f8c63c..42ccf9687 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-dht-api/
-DEFAULTCONFIG = test_dht_api_data.conf
[fs]
AUTOSTART = NO
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index e56024c0d..eea39e031 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -52,7 +52,6 @@ WEAKRANDOM = YES
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_dht_api_peer1.conf
SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index ff34a3c25..0ce4a4e9b 100644
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test_dht_topo/
-DEFAULTCONFIG = test_dht_line.conf
[arm]
PORT = 10010
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index 9cb87d248..999ed3807 100644
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -13,7 +13,6 @@ ACCEPT_FROM = 127.0.0.1;
#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dht/.libs/gnunet-service-dht
#PREFIX = xterm -T dht -e gdb --args
#PREFIX = valgrind --log-file=dht_%p
-CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12100
@@ -37,7 +36,6 @@ ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
NEIGHBOUR_LIMIT = 50
BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12365
@@ -53,7 +51,6 @@ WAN_QUOTA_OUT = 1 GB
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12092
@@ -64,7 +61,6 @@ DEFAULTSERVICES = dht core
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12366
@@ -107,7 +103,6 @@ HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_dht_multipeer_data.conf
SERVICEHOME = /tmp/test-dht-multipeer/
[nat]
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 809338834..51e7a6b8e 100644
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -1,5 +1,4 @@
[PATHS]
-DEFAULTCONFIG = test_dht_twopeer_data.conf
SERVICEHOME = /tmp/test-dht-twopeer/
[resolver]
diff --git a/src/dns/dns.conf.in b/src/dns/dns.conf.in
index d2c67958a..65cb392e2 100644
--- a/src/dns/dns.conf.in
+++ b/src/dns/dns.conf.in
@@ -2,7 +2,6 @@
AUTOSTART = YES
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
UNIXPATH = /tmp/gnunet-service-dns.sock
diff --git a/src/dv/dv.conf.in b/src/dv/dv.conf.in
index 93278df7c..158bbcdd6 100644
--- a/src/dv/dv.conf.in
+++ b/src/dv/dv.conf.in
@@ -4,7 +4,6 @@ DEBUG = NO
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
BINARY = gnunet-service-dv
-CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
@UNIXONLY@ PORT = 2571
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 1078c369f..3daa6a7f4 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunet-dv-testing/
-DEFAULTCONFIG = test_transport_dv_data.conf
[resolver]
PORT = 2564
@@ -39,7 +38,6 @@ DEBUG = NO
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
BINARY = gnunet-service-dv
-CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 2571
diff --git a/src/exit/exit.conf b/src/exit/exit.conf
index 0d48de94b..d0a4b35f3 100644
--- a/src/exit/exit.conf
+++ b/src/exit/exit.conf
@@ -1,5 +1,4 @@
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
# IPv6 address for the TUN interface (must be changed as this
diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index 6c4d8217d..cac59e5cb 100644
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -8,7 +8,6 @@ UPDATE_DIR = $SERVICEHOME/fs/updates/
@UNIXONLY@ PORT = 2094
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -34,7 +33,6 @@ PREFIX = @MONKEYPREFIX@
[gnunet-auto-share]
BINARY = gnunet-auto-share
-CONFIG = $DEFAULTCONFIG
# Note: MUST specify path to auto-share directory and CAN specify other options
# to gnunet-auto-share here!
diff --git a/src/fs/test_fs_data.conf b/src/fs/test_fs_data.conf
index f2b4e1ee7..40e85ad4c 100644
--- a/src/fs/test_fs_data.conf
+++ b/src/fs/test_fs_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-data/
-DEFAULTCONFIG = test_fs_data.conf
[fs]
ACTIVEMIGRATION = NO
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index e0e697ec7..d1c4d8292 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-lib/
-DEFAULTCONFIG = fs_test_lib_data.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf
index 25aad5119..7955daa4d 100644
--- a/src/fs/test_fs_download_data.conf
+++ b/src/fs/test_fs_download_data.conf
@@ -1,5 +1,4 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-download/
-DEFAULTCONFIG = test_fs_download_data.conf
diff --git a/src/fs/test_fs_file_information_data.conf b/src/fs/test_fs_file_information_data.conf
index 09cedf899..ea43807b1 100644
--- a/src/fs/test_fs_file_information_data.conf
+++ b/src/fs/test_fs_file_information_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-file-information/
-DEFAULTCONFIG = test_fs_file_information_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/fs/test_fs_list_indexed_data.conf
index 704ba4d66..99d446680 100644
--- a/src/fs/test_fs_list_indexed_data.conf
+++ b/src/fs/test_fs_list_indexed_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/
-DEFAULTCONFIG = test_fs_list_indexed_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_fs_namespace_data.conf b/src/fs/test_fs_namespace_data.conf
index 3cdd241d7..625eb2d51 100644
--- a/src/fs/test_fs_namespace_data.conf
+++ b/src/fs/test_fs_namespace_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-namespace/
-DEFAULTCONFIG = test_fs_namespace_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_fs_publish_data.conf b/src/fs/test_fs_publish_data.conf
index 234f2b0ef..14e69197b 100644
--- a/src/fs/test_fs_publish_data.conf
+++ b/src/fs/test_fs_publish_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-publish/
-DEFAULTCONFIG = test_fs_publish_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_fs_search_data.conf b/src/fs/test_fs_search_data.conf
index ea5e4c5e3..812a7bfe2 100644
--- a/src/fs/test_fs_search_data.conf
+++ b/src/fs/test_fs_search_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-search/
-DEFAULTCONFIG = test_fs_search_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_fs_unindex_data.conf b/src/fs/test_fs_unindex_data.conf
index 977d6e759..fa28fbbbd 100644
--- a/src/fs/test_fs_unindex_data.conf
+++ b/src/fs/test_fs_unindex_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-unindex/
-DEFAULTCONFIG = test_fs_unindex_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_gnunet_fs_idx_data.conf b/src/fs/test_gnunet_fs_idx_data.conf
index f852011a8..4394805e5 100644
--- a/src/fs/test_gnunet_fs_idx_data.conf
+++ b/src/fs/test_gnunet_fs_idx_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-py-idx/
-DEFAULTCONFIG = test_gnunet_fs_idx_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_gnunet_fs_ns_data.conf b/src/fs/test_gnunet_fs_ns_data.conf
index 5f297abfa..57e3432e1 100644
--- a/src/fs/test_gnunet_fs_ns_data.conf
+++ b/src/fs/test_gnunet_fs_ns_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-py-ns/
-DEFAULTCONFIG = test_gnunet_fs_ns_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_gnunet_fs_psd_data.conf b/src/fs/test_gnunet_fs_psd_data.conf
index b68c6b58e..e41f6bfe3 100644
--- a/src/fs/test_gnunet_fs_psd_data.conf
+++ b/src/fs/test_gnunet_fs_psd_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-py-psd/
-DEFAULTCONFIG = test_gnunet_fs_psd_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_gnunet_fs_rec_data.conf b/src/fs/test_gnunet_fs_rec_data.conf
index dae8b19a8..fcdcda96d 100644
--- a/src/fs/test_gnunet_fs_rec_data.conf
+++ b/src/fs/test_gnunet_fs_rec_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-py-rec/
-DEFAULTCONFIG = test_gnunet_fs_rec_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf b/src/fs/test_gnunet_service_fs_migration_data.conf
index 9c05a88e9..cd14c3261 100644
--- a/src/fs/test_gnunet_service_fs_migration_data.conf
+++ b/src/fs/test_gnunet_service_fs_migration_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-service-fs-migration/
-DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf
[ats]
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;
diff --git a/src/hostlist/hostlist.conf b/src/hostlist/hostlist.conf
index f7c1be39d..8c3675fd8 100644
--- a/src/hostlist/hostlist.conf
+++ b/src/hostlist/hostlist.conf
@@ -3,7 +3,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
# consider having "-e" as default as well once implemented
OPTIONS = -b
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 78dde578e..c880190a1 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
-DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf
[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 41862daf3..c3833381a 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
-DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf
[transport-tcp]
PORT = 22968
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf
index c2d0a70d2..c7ef8ea0f 100644
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/src/hostlist/test_hostlist_defaults.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist/
-DEFAULTCONFIG = test_hostlist_default.conf
[resolver]
PORT = 12464
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index fe50bd519..b08660a33 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -1,7 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
-DEFAULTCONFIG = test_learning_adv_peer.conf
[transport-tcp]
PORT = 22968
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index 0136d7706..95de70530 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -1,7 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
-DEFAULTCONFIG = test_learning_learn_peer.conf
[transport-tcp]
PORT = 12968
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index 4fd54bbc9..f70fbda5f 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/
-DEFAULTCONFIG = test_learning_learn_peer2.conf
[transport-tcp]
PORT = 32968
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index e96c31cf4..70c50ec53 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_bootstrap_server/
-DEFAULTCONFIG = confs/c_bootstrap_server.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -22,7 +20,6 @@ AUTOSTART = YES
PORT = 20017
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -35,7 +32,6 @@ AUTOSTART = YES
PORT = 20016
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -48,7 +44,6 @@ AUTOSTART = YES
PORT = 20015
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -67,7 +62,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -78,7 +72,6 @@ UNIX_MATCH_GID = YES
PORT = 20014
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -101,7 +94,6 @@ AUTOSTART = YES
PORT = 20013
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -125,7 +117,6 @@ AUTOSTART = YES
PORT = 20012
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -147,7 +138,6 @@ AUTOSTART = YES
PORT = 20011
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -199,7 +189,6 @@ AUTOSTART = NO
PORT = 20006
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -217,7 +206,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
PORT = 20005
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -232,7 +220,6 @@ MIN_MIGRATION_DELAY = 100 ms
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -243,7 +230,6 @@ VIRTDNS6 = 1234::17
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -258,7 +244,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -269,7 +254,6 @@ PROVIDE_EXIT = NO
PORT = 20004
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -282,7 +266,6 @@ UNIX_MATCH_GID = YES
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -p
#SERVERS = http://v9.gnunet.org:58080/
@@ -293,7 +276,6 @@ AUTOSTART = YES
PORT = 20003
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -327,7 +309,6 @@ AUTOSTART = YES
PORT = 20001
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -340,7 +321,6 @@ AUTOSTART = YES
PORT = 20000
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -370,4 +350,4 @@ AUTOSTART = NO
AUTOSTART = NO
[lockmanager]
-AUTOSTART = NO \ No newline at end of file
+AUTOSTART = NO
diff --git a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
index 5081553c9..77dcd7427 100644
--- a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
+++ b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_bootstrap_server/
-DEFAULTCONFIG = confs/c_bootstrap_server_w_massif.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -22,7 +20,6 @@ AUTOSTART = YES
PORT = 20017
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -35,7 +32,6 @@ AUTOSTART = YES
PORT = 20016
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -48,7 +44,6 @@ AUTOSTART = YES
PORT = 20015
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -67,7 +62,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -78,7 +72,6 @@ UNIX_MATCH_GID = YES
PORT = 20014
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -101,7 +94,6 @@ AUTOSTART = YES
PORT = 20013
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -125,7 +117,6 @@ AUTOSTART = YES
PORT = 20012
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -148,7 +139,6 @@ AUTOSTART = YES
PORT = 20011
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -200,7 +190,6 @@ AUTOSTART = NO
PORT = 20006
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -218,7 +207,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
PORT = 20005
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -233,7 +221,6 @@ MIN_MIGRATION_DELAY = 100 ms
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -244,7 +231,6 @@ VIRTDNS6 = 1234::17
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -259,7 +245,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -270,7 +255,6 @@ PROVIDE_EXIT = NO
PORT = 20004
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -283,7 +267,6 @@ UNIX_MATCH_GID = YES
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -p
#SERVERS = http://v9.gnunet.org:58080/
@@ -294,7 +277,6 @@ AUTOSTART = YES
PORT = 20003
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -328,7 +310,6 @@ AUTOSTART = YES
PORT = 20001
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -341,7 +322,6 @@ AUTOSTART = YES
PORT = 20000
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index 9e12bb9fa..ffba6d560 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_nat_client
-DEFAULTCONFIG = confs/c_nat_client.conf
[gnunetd]
HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@ AUTOSTART = YES
PORT = 20071
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@ AUTOSTART = YES
PORT = 20070
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@ AUTOSTART = YES
PORT = 20069
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES
PORT = 20068
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@ AUTOSTART = YES
PORT = 20067
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
PORT = 20066
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@ AUTOSTART = YES
PORT = 20065
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@ AUTOSTART = NO
PORT = 20060
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
PORT = 20059
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -264,7 +250,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO
PORT = 20058
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -299,7 +282,6 @@ AUTOSTART = YES
PORT = 20057
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@ AUTOSTART = YES
PORT = 20055
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@ AUTOSTART = YES
PORT = 20054
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index e3c30f783..8d4c7e3e8 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client/
-DEFAULTCONFIG = confs/c_no_nat_client.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -28,7 +26,6 @@ AUTOSTART = YES
PORT = 20035
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -41,7 +38,6 @@ AUTOSTART = YES
PORT = 20034
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -54,7 +50,6 @@ AUTOSTART = YES
PORT = 20033
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES
PORT = 20032
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -107,7 +100,6 @@ AUTOSTART = YES
PORT = 20031
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
PORT = 20030
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -155,7 +146,6 @@ AUTOSTART = YES
PORT = 20029
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -207,7 +197,6 @@ AUTOSTART = NO
PORT = 20024
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -225,7 +214,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
PORT = 20023
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -240,7 +228,6 @@ MIN_MIGRATION_DELAY = 100 ms
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -251,7 +238,6 @@ VIRTDNS6 = 1234::17
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -266,7 +252,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -277,7 +262,6 @@ PROVIDE_EXIT = NO
PORT = 20022
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -290,7 +274,6 @@ UNIX_MATCH_GID = YES
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -301,7 +284,6 @@ AUTOSTART = YES
PORT = 20021
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -335,7 +317,6 @@ AUTOSTART = YES
PORT = 20019
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -348,7 +329,6 @@ AUTOSTART = YES
PORT = 20018
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf
index 2ea3a9f6d..96d391b3d 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client_2/
-DEFAULTCONFIG = confs/c_no_nat_client_2.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@ AUTOSTART = YES
PORT = 20053
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -24,7 +22,6 @@ AUTOSTART = YES
PORT = 20052
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -37,7 +34,6 @@ AUTOSTART = YES
PORT = 20051
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -56,7 +52,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -67,7 +62,6 @@ UNIX_MATCH_GID = YES
PORT = 20050
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -90,7 +84,6 @@ AUTOSTART = YES
PORT = 20049
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -114,7 +107,6 @@ AUTOSTART = YES
PORT = 20048
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -136,7 +128,6 @@ AUTOSTART = YES
PORT = 20047
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -188,7 +179,6 @@ AUTOSTART = NO
PORT = 20042
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -206,7 +196,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
PORT = 20041
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -221,7 +210,6 @@ MIN_MIGRATION_DELAY = 100 ms
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -232,7 +220,6 @@ VIRTDNS6 = 1234::17
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -247,7 +234,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -258,7 +244,6 @@ PROVIDE_EXIT = NO
PORT = 20040
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -271,7 +256,6 @@ UNIX_MATCH_GID = YES
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -282,7 +266,6 @@ AUTOSTART = YES
PORT = 20039
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -316,7 +299,6 @@ AUTOSTART = YES
PORT = 20037
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -329,7 +311,6 @@ AUTOSTART = YES
PORT = 20036
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf
index 0ed1aee8f..523a4fdcf 100644
--- a/src/integration-tests/confs/c_no_nat_client_http.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client/
-DEFAULTCONFIG = confs/c_no_nat_client_http.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -28,7 +26,6 @@ AUTOSTART = YES
PORT = 20035
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -41,7 +38,6 @@ AUTOSTART = YES
PORT = 20034
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -54,7 +50,6 @@ AUTOSTART = YES
PORT = 20033
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES
PORT = 20032
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -107,7 +100,6 @@ AUTOSTART = YES
PORT = 20031
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
PORT = 20030
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -155,7 +146,6 @@ AUTOSTART = YES
PORT = 20029
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -207,7 +197,6 @@ AUTOSTART = NO
PORT = 20024
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -225,7 +214,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
PORT = 20023
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -240,7 +228,6 @@ MIN_MIGRATION_DELAY = 100 ms
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -251,7 +238,6 @@ VIRTDNS6 = 1234::17
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -266,7 +252,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -277,7 +262,6 @@ PROVIDE_EXIT = NO
PORT = 20022
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -290,7 +274,6 @@ UNIX_MATCH_GID = YES
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -301,7 +284,6 @@ AUTOSTART = YES
PORT = 20021
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -335,7 +317,6 @@ AUTOSTART = YES
PORT = 20019
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -348,7 +329,6 @@ AUTOSTART = YES
PORT = 20018
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_no_nat_client_http_2.conf b/src/integration-tests/confs/c_no_nat_client_http_2.conf
index 47c861a72..1f7f08523 100644
--- a/src/integration-tests/confs/c_no_nat_client_http_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http_2.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client_2/
-DEFAULTCONFIG = confs/c_no_nat_client_http_2.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
PORT = 20053
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -30,7 +28,6 @@ AUTOSTART = YES
PORT = 20052
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -43,7 +40,6 @@ AUTOSTART = YES
PORT = 20051
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -62,7 +58,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -73,7 +68,6 @@ UNIX_MATCH_GID = YES
PORT = 20050
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -96,7 +90,6 @@ AUTOSTART = YES
PORT = 20049
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -120,7 +113,6 @@ AUTOSTART = YES
PORT = 20048
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -144,7 +136,6 @@ AUTOSTART = YES
PORT = 20047
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -196,7 +187,6 @@ AUTOSTART = NO
PORT = 20042
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -214,7 +204,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
PORT = 20041
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -229,7 +218,6 @@ MIN_MIGRATION_DELAY = 100 ms
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -240,7 +228,6 @@ VIRTDNS6 = 1234::17
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -255,7 +242,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -266,7 +252,6 @@ PROVIDE_EXIT = NO
PORT = 20040
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -279,7 +264,6 @@ UNIX_MATCH_GID = YES
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -290,7 +274,6 @@ AUTOSTART = YES
PORT = 20039
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -324,7 +307,6 @@ AUTOSTART = YES
PORT = 20037
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -337,7 +319,6 @@ AUTOSTART = YES
PORT = 20036
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf
index b48042908..62d679fd2 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client/
-DEFAULTCONFIG = confs/c_no_nat_client_unix.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -28,7 +26,6 @@ AUTOSTART = YES
PORT = 20035
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -41,7 +38,6 @@ AUTOSTART = YES
PORT = 20034
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -54,7 +50,6 @@ AUTOSTART = YES
PORT = 20033
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES
PORT = 20032
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -107,7 +100,6 @@ AUTOSTART = YES
PORT = 20031
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
PORT = 20030
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -155,7 +146,6 @@ AUTOSTART = YES
PORT = 20029
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -210,7 +200,6 @@ AUTOSTART = NO
PORT = 20024
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -228,7 +217,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
PORT = 20023
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -243,7 +231,6 @@ MIN_MIGRATION_DELAY = 100 ms
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -254,7 +241,6 @@ VIRTDNS6 = 1234::17
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -269,7 +255,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -280,7 +265,6 @@ PROVIDE_EXIT = NO
PORT = 20022
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -293,7 +277,6 @@ UNIX_MATCH_GID = YES
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -304,7 +287,6 @@ AUTOSTART = YES
PORT = 20021
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -338,7 +320,6 @@ AUTOSTART = YES
PORT = 20019
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -351,7 +332,6 @@ AUTOSTART = YES
PORT = 20018
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_no_nat_client_unix_2.conf b/src/integration-tests/confs/c_no_nat_client_unix_2.conf
index ca4da89cb..a4080ab20 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix_2.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client_2/
-DEFAULTCONFIG = confs/c_no_nat_client_unix_2.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
PORT = 20053
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -30,7 +28,6 @@ AUTOSTART = YES
PORT = 20052
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -43,7 +40,6 @@ AUTOSTART = YES
PORT = 20051
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -62,7 +58,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -73,7 +68,6 @@ UNIX_MATCH_GID = YES
PORT = 20050
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -96,7 +90,6 @@ AUTOSTART = YES
PORT = 20049
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -120,7 +113,6 @@ AUTOSTART = YES
PORT = 20048
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -144,7 +136,6 @@ AUTOSTART = YES
PORT = 20047
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -199,7 +190,6 @@ AUTOSTART = NO
PORT = 20042
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -217,7 +207,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
PORT = 20041
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -232,7 +221,6 @@ MIN_MIGRATION_DELAY = 100 ms
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -243,7 +231,6 @@ VIRTDNS6 = 1234::17
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -258,7 +245,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -269,7 +255,6 @@ PROVIDE_EXIT = NO
PORT = 20040
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -282,7 +267,6 @@ UNIX_MATCH_GID = YES
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -293,7 +277,6 @@ AUTOSTART = YES
PORT = 20039
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -327,7 +310,6 @@ AUTOSTART = YES
PORT = 20037
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -340,7 +322,6 @@ AUTOSTART = YES
PORT = 20036
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf
index f01cac9d1..d224670fe 100644
--- a/src/integration-tests/confs/c_normal_client_tcp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_normal_client
-DEFAULTCONFIG = confs/c_normal_client_tcp.conf
[gnunetd]
HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@ AUTOSTART = YES
PORT = 20071
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@ AUTOSTART = YES
PORT = 20070
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@ AUTOSTART = YES
PORT = 20069
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES
PORT = 20068
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@ AUTOSTART = YES
PORT = 20067
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
PORT = 20066
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@ AUTOSTART = YES
PORT = 20065
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@ AUTOSTART = NO
PORT = 20060
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
PORT = 20059
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -264,7 +250,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO
PORT = 20058
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
@@ -299,7 +282,6 @@ AUTOSTART = YES
PORT = 20057
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@ AUTOSTART = YES
PORT = 20055
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@ AUTOSTART = YES
PORT = 20054
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp.conf b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
index f515609bd..b94eecd8b 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_normal_client
-DEFAULTCONFIG = confs/c_normal_client_tcp_udp.conf
[gnunetd]
HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@ AUTOSTART = YES
PORT = 20071
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@ AUTOSTART = YES
PORT = 20070
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@ AUTOSTART = YES
PORT = 20069
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES
PORT = 20068
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@ AUTOSTART = YES
PORT = 20067
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
PORT = 20066
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@ AUTOSTART = YES
PORT = 20065
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@ AUTOSTART = NO
PORT = 20060
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
PORT = 20059
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -264,7 +250,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO
PORT = 20058
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
@@ -299,7 +282,6 @@ AUTOSTART = YES
PORT = 20057
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@ AUTOSTART = YES
PORT = 20055
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@ AUTOSTART = YES
PORT = 20054
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -367,4 +347,4 @@ UNIX_MATCH_GID = YES
[dhtcache]
DATABASE = sqlite
-QUOTA = 1 MB \ No newline at end of file
+QUOTA = 1 MB
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
index a4a30c18c..c887bdae0 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_normal_client
-DEFAULTCONFIG = confs/c_normal_client_tcp_udp_http.conf
[gnunetd]
HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@ AUTOSTART = YES
PORT = 20071
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@ AUTOSTART = YES
PORT = 20070
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@ AUTOSTART = YES
PORT = 20069
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES
PORT = 20068
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@ AUTOSTART = YES
PORT = 20067
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@ AUTOSTART = YES
PORT = 20066
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@ AUTOSTART = YES
PORT = 20065
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@ AUTOSTART = NO
PORT = 20060
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
PORT = 20059
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -264,7 +250,6 @@ AUTOSTART = YES
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO
PORT = 20058
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
@@ -299,7 +282,6 @@ AUTOSTART = YES
PORT = 20057
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@ AUTOSTART = YES
PORT = 20055
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@ AUTOSTART = YES
PORT = 20054
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -367,4 +347,4 @@ UNIX_MATCH_GID = YES
[dhtcache]
DATABASE = sqlite
-QUOTA = 1 MB \ No newline at end of file
+QUOTA = 1 MB
diff --git a/src/lockmanager/lockmanager.conf.in b/src/lockmanager/lockmanager.conf.in
index 75b9244dc..42d574324 100644
--- a/src/lockmanager/lockmanager.conf.in
+++ b/src/lockmanager/lockmanager.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
@UNIXONLY@ PORT = 2100
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-lockmanager
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/lockmanager/test_lockmanager_api.conf b/src/lockmanager/test_lockmanager_api.conf
index 894f40908..af0d99319 100644
--- a/src/lockmanager/test_lockmanager_api.conf
+++ b/src/lockmanager/test_lockmanager_api.conf
@@ -63,7 +63,6 @@ PEERGROUP_TIMEOUT = 2400 s
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_lockmanager_api.conf
SERVICEHOME = /tmp/test-lockmanager/
[dns]
diff --git a/src/mesh/mesh.conf.in b/src/mesh/mesh.conf.in
index 83b45c786..fd3fced12 100644
--- a/src/mesh/mesh.conf.in
+++ b/src/mesh/mesh.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
@UNIXONLY@ PORT = 2096
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index e3fd00037..d8bdd7a13 100644
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -72,7 +72,6 @@ WEAKRANDOM = YES
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_mesh.conf
SERVICEHOME = /tmp/test-mesh/
[dns]
diff --git a/src/mesh/test_mesh_2dtorus.conf b/src/mesh/test_mesh_2dtorus.conf
index 0d15ea509..b6291fff5 100644
--- a/src/mesh/test_mesh_2dtorus.conf
+++ b/src/mesh/test_mesh_2dtorus.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test_mesh_small/
-DEFAULTCONFIG = test_mesh_small.conf
[arm]
PORT = 10010
diff --git a/src/mesh/test_mesh_path.conf b/src/mesh/test_mesh_path.conf
index 82bb3e02a..5ac9710d4 100644
--- a/src/mesh/test_mesh_path.conf
+++ b/src/mesh/test_mesh_path.conf
@@ -69,7 +69,6 @@ WEAKRANDOM = YES
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_mesh.conf
SERVICEHOME = /tmp/test-mesh/
[dns]
diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index 8c0a5f88e..2277a9a76 100644
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test_mesh_small/
-DEFAULTCONFIG = test_mesh_small.conf
[mesh]
PORT = 10005
diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in
index 6f7129734..d7c372d80 100644
--- a/src/namestore/namestore.conf.in
+++ b/src/namestore/namestore.conf.in
@@ -6,7 +6,6 @@ UNIX_MATCH_GID = YES
@UNIXONLY@ PORT = 2099
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-namestore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/namestore/test_namestore_api.conf b/src/namestore/test_namestore_api.conf
index bcbbca91a..565805921 100644
--- a/src/namestore/test_namestore_api.conf
+++ b/src/namestore/test_namestore_api.conf
@@ -12,7 +12,6 @@ UNIX_MATCH_GID = YES
PORT = 2099
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-namestore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf
index 7ad00a03c..b3bab0451 100644
--- a/src/nat/test_nat_data.conf
+++ b/src/nat/test_nat_data.conf
@@ -1,8 +1,6 @@
[PATHS]
SERVICEHOME = /tmp/nat-test
# SERVICEHOME = /var/lib/gnunet/
-# DEFAULTCONFIG = /etc/gnunet.conf
-# If 'DEFAULTCONFIG' is not defined, the current
# configuration file is assumed to be the default,
# which is what we want by default...
@@ -51,7 +49,6 @@ DISABLEV6 = NO
PORT = 2087
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -75,7 +72,6 @@ AUTOSTART = YES
PORT = 2088
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -97,7 +93,6 @@ AUTOSTART = YES
PORT = 2089
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf
index 1128b37ea..b30240c57 100644
--- a/src/nat/test_nat_test_data.conf
+++ b/src/nat/test_nat_test_data.conf
@@ -1,8 +1,6 @@
[PATHS]
SERVICEHOME = /tmp/nat-test
# SERVICEHOME = /var/lib/gnunet/
-# DEFAULTCONFIG = /etc/gnunet.conf
-# If 'DEFAULTCONFIG' is not defined, the current
# configuration file is assumed to be the default,
# which is what we want by default...
diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in
index bc49e051d..84f1f6c22 100644
--- a/src/nse/nse.conf.in
+++ b/src/nse/nse.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
@JAVAPORT@PORT = 2097
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 49f749fda..b4709dd38 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/nse-profiler/
-DEFAULTCONFIG = nse_profiler_test.conf
[nse]
PORT = 0
@@ -10,7 +9,6 @@ BINARY = gnunet-service-nse
#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
AUTOSTART = NO
DEBUG = YES
-CONFIG = $DEFAULTCONFIG
# Overriding network settings for faster testing (do NOT use
# these values in production just because they are here)
WORKDELAY = 60 s
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index 66075d792..625d059ee 100644
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-nse-multipeer/
-DEFAULTCONFIG = test_nse.conf
[nse]
PORT = 22353
@@ -10,7 +9,6 @@ BINARY = gnunet-service-nse
#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
AUTOSTART = YES
DEBUG = NO
-CONFIG = $DEFAULTCONFIG
PROOFFILE = $SERVICEHOME/proof.nse
# Overriding network settings for faster testing (do NOT use
# these values in production just because they are here)
diff --git a/src/peerinfo/peerinfo.conf.in b/src/peerinfo/peerinfo.conf.in
index c45a05262..6bf766d28 100644
--- a/src/peerinfo/peerinfo.conf.in
+++ b/src/peerinfo/peerinfo.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
@JAVAPORT@PORT = 2090
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/pt/pt.conf b/src/pt/pt.conf
index 39c1fb60c..a1eea3305 100644
--- a/src/pt/pt.conf
+++ b/src/pt/pt.conf
@@ -1,5 +1,4 @@
[pt]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-pt
# Set this to YES to tunnel IPv4 traffic over GNUnet
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index fa12b98ba..474b55f79 100644
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -47,7 +47,7 @@ TTL = 3600000
[gns]
AUTOSTART = YES
-ZONEKEY = $SERVICEHOME/hostkey
+ZONEKEY = $SERVICEHOME/.hostkey
HIJACK_DNS = YES
[namestore]
diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf
index bdac1a5b6..ae9488e8e 100644
--- a/src/pt/test_gnunet_vpn.conf
+++ b/src/pt/test_gnunet_vpn.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-vpn/
-DEFAULTCONFIG = test_gnunet_vpn.conf
[transport]
PLUGINS = tcp
diff --git a/src/regex/test_regex_big.conf b/src/regex/test_regex_big.conf
index f24bc8b5d..f21a2ba57 100644
--- a/src/regex/test_regex_big.conf
+++ b/src/regex/test_regex_big.conf
@@ -72,7 +72,6 @@ PEERGROUP_TIMEOUT = 2400 s
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_stream_local.conf
SERVICEHOME = /tmp/test-stream/
[dns]
diff --git a/src/statistics/statistics.conf.in b/src/statistics/statistics.conf.in
index 5de9dedea..669e89bd7 100644
--- a/src/statistics/statistics.conf.in
+++ b/src/statistics/statistics.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
@JAVAPORT@PORT = 2088
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/statistics/test_statistics_api_data.conf b/src/statistics/test_statistics_api_data.conf
index 4e229e930..c52ff35b3 100644
--- a/src/statistics/test_statistics_api_data.conf
+++ b/src/statistics/test_statistics_api_data.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunetd-statistics/
-DEFAULTCONFIG = test_statistics_api_data.conf
[statistics]
PORT = 22353
diff --git a/src/stream/test_stream_local.conf b/src/stream/test_stream_local.conf
index df4e49398..b718c01ee 100644
--- a/src/stream/test_stream_local.conf
+++ b/src/stream/test_stream_local.conf
@@ -73,7 +73,6 @@ PEERGROUP_TIMEOUT = 2400 s
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_stream_local.conf
SERVICEHOME = /tmp/test-stream/
[dns]
diff --git a/src/template/template.conf b/src/template/template.conf
index 522721fb6..439bbd2e6 100644
--- a/src/template/template.conf
+++ b/src/template/template.conf
@@ -3,7 +3,6 @@ AUTOSTART = NO
PORT = 9999
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf
index 9fdb9bcda..2fdefcc1f 100644
--- a/src/testbed/test_testbed_api.conf
+++ b/src/testbed/test_testbed_api.conf
@@ -62,7 +62,6 @@ PEERGROUP_TIMEOUT = 2400 s
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_testbed_api.conf
SERVICEHOME = /tmp/test-testbed/
[dns]
diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in
index 5f5585c04..ccd9c4f79 100644
--- a/src/testbed/testbed.conf.in
+++ b/src/testbed/testbed.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = NO
@UNIXONLY@ PORT = 2101
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-testbed
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -12,4 +11,4 @@ UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
MAX_PARALLEL_OPERATIONS = 1000
MAX_PARALLEL_SERVICE_CONNECTIONS = 1000
-MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5 \ No newline at end of file
+MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf
index 80049ba4c..411c3ecb5 100644
--- a/src/testing/test_testing_defaults.conf
+++ b/src/testing/test_testing_defaults.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing/
-DEFAULTCONFIG = test_testing_defaults.conf
[resolver]
PORT = 2564
diff --git a/src/testing_old/test_testing_2dtorus.conf b/src/testing_old/test_testing_2dtorus.conf
index 69c59567d..4ec3db83e 100644
--- a/src/testing_old/test_testing_2dtorus.conf
+++ b/src/testing_old/test_testing_2dtorus.conf
@@ -1,7 +1,6 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test_testing_2dtorus/
-DEFAULTCONFIG = test_testing_2dtorus.conf
[arm]
PORT = 10010
diff --git a/src/testing_old/test_testing_connect_peer1.conf b/src/testing_old/test_testing_connect_peer1.conf
index cccda5e2a..3349990c5 100644
--- a/src/testing_old/test_testing_connect_peer1.conf
+++ b/src/testing_old/test_testing_connect_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing-connect-peer1/
-DEFAULTCONFIG = test_testing_connect_peer1.conf
[transport-tcp]
PORT = 12568
diff --git a/src/testing_old/test_testing_connect_peer2.conf b/src/testing_old/test_testing_connect_peer2.conf
index 08ec55113..fb1f19c8e 100644
--- a/src/testing_old/test_testing_connect_peer2.conf
+++ b/src/testing_old/test_testing_connect_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing-connect-peer2/
-DEFAULTCONFIG = test_testing_connect_peer2.conf
[transport-tcp]
PORT = 22568
diff --git a/src/testing_old/test_testing_data.conf b/src/testing_old/test_testing_data.conf
index c46cb0d42..8bccc3e8d 100644
--- a/src/testing_old/test_testing_data.conf
+++ b/src/testing_old/test_testing_data.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data.conf
[arm]
DEFAULTSERVICES = core
diff --git a/src/testing_old/test_testing_data_remote.conf b/src/testing_old/test_testing_data_remote.conf
index 477baad7e..3c7389afc 100644
--- a/src/testing_old/test_testing_data_remote.conf
+++ b/src/testing_old/test_testing_data_remote.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_remote.conf
[TESTING_old]
CONTROL_HOST = 127.0.0.1
diff --git a/src/testing_old/test_testing_data_topology_2d_torus.conf b/src/testing_old/test_testing_data_topology_2d_torus.conf
index 62fff6925..6a890e95b 100644
--- a/src/testing_old/test_testing_data_topology_2d_torus.conf
+++ b/src/testing_old/test_testing_data_topology_2d_torus.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_2d_torus.conf
[TESTING_old]
NUM_PEERS = 13
diff --git a/src/testing_old/test_testing_data_topology_blacklist.conf b/src/testing_old/test_testing_data_topology_blacklist.conf
index 28e61301a..d60d9d77a 100644
--- a/src/testing_old/test_testing_data_topology_blacklist.conf
+++ b/src/testing_old/test_testing_data_topology_blacklist.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_blacklist.conf
[TESTING_old]
NUM_PEERS = 4
diff --git a/src/testing_old/test_testing_data_topology_churn.conf b/src/testing_old/test_testing_data_topology_churn.conf
index ae46bf0e6..53a261f2b 100644
--- a/src/testing_old/test_testing_data_topology_churn.conf
+++ b/src/testing_old/test_testing_data_topology_churn.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_churn.conf
[TESTING_old]
NUM_PEERS = 12
diff --git a/src/testing_old/test_testing_data_topology_clique.conf b/src/testing_old/test_testing_data_topology_clique.conf
index c71a4b6c2..8ef25c78e 100644
--- a/src/testing_old/test_testing_data_topology_clique.conf
+++ b/src/testing_old/test_testing_data_topology_clique.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
CONNECT_TIMEOUT = 180 s
diff --git a/src/testing_old/test_testing_data_topology_clique_dfs.conf b/src/testing_old/test_testing_data_topology_clique_dfs.conf
index 349c398ed..8fc926320 100644
--- a/src/testing_old/test_testing_data_topology_clique_dfs.conf
+++ b/src/testing_old/test_testing_data_topology_clique_dfs.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
NUM_PEERS = 7
diff --git a/src/testing_old/test_testing_data_topology_clique_minimum.conf b/src/testing_old/test_testing_data_topology_clique_minimum.conf
index 8d8206d33..88de2aef1 100644
--- a/src/testing_old/test_testing_data_topology_clique_minimum.conf
+++ b/src/testing_old/test_testing_data_topology_clique_minimum.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
NUM_PEERS = 20
diff --git a/src/testing_old/test_testing_data_topology_clique_random.conf b/src/testing_old/test_testing_data_topology_clique_random.conf
index d76175291..a88ddccbc 100644
--- a/src/testing_old/test_testing_data_topology_clique_random.conf
+++ b/src/testing_old/test_testing_data_topology_clique_random.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
NUM_PEERS = 20
diff --git a/src/testing_old/test_testing_data_topology_erdos_renyi.conf b/src/testing_old/test_testing_data_topology_erdos_renyi.conf
index ece17e505..e8a5883b2 100644
--- a/src/testing_old/test_testing_data_topology_erdos_renyi.conf
+++ b/src/testing_old/test_testing_data_topology_erdos_renyi.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
TOPOLOGY = ERDOS_RENYI
diff --git a/src/testing_old/test_testing_data_topology_internat.conf b/src/testing_old/test_testing_data_topology_internat.conf
index 14475ce55..2a0da4ac2 100644
--- a/src/testing_old/test_testing_data_topology_internat.conf
+++ b/src/testing_old/test_testing_data_topology_internat.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
TOPOLOGY = INTERNAT
diff --git a/src/testing_old/test_testing_data_topology_none.conf b/src/testing_old/test_testing_data_topology_none.conf
index 38e658680..e0ffe5244 100644
--- a/src/testing_old/test_testing_data_topology_none.conf
+++ b/src/testing_old/test_testing_data_topology_none.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
NUM_PEERS = 1000
diff --git a/src/testing_old/test_testing_data_topology_ring.conf b/src/testing_old/test_testing_data_topology_ring.conf
index 5320ae068..4720d6ddd 100644
--- a/src/testing_old/test_testing_data_topology_ring.conf
+++ b/src/testing_old/test_testing_data_topology_ring.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
TOPOLOGY = RING
diff --git a/src/testing_old/test_testing_data_topology_scale_free.conf b/src/testing_old/test_testing_data_topology_scale_free.conf
index ae7233588..06a8095f0 100644
--- a/src/testing_old/test_testing_data_topology_scale_free.conf
+++ b/src/testing_old/test_testing_data_topology_scale_free.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_scale_free.conf
[TESTING_old]
NUM_PEERS = 50
diff --git a/src/testing_old/test_testing_data_topology_small_world_ring.conf b/src/testing_old/test_testing_data_topology_small_world_ring.conf
index 10e398fa0..dc4f0991a 100644
--- a/src/testing_old/test_testing_data_topology_small_world_ring.conf
+++ b/src/testing_old/test_testing_data_topology_small_world_ring.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
NUM_PEERS = 25
diff --git a/src/testing_old/test_testing_data_topology_small_world_torus.conf b/src/testing_old/test_testing_data_topology_small_world_torus.conf
index d5a58b760..cfc2f76d2 100644
--- a/src/testing_old/test_testing_data_topology_small_world_torus.conf
+++ b/src/testing_old/test_testing_data_topology_small_world_torus.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
TOPOLOGY = SMALL_WORLD
diff --git a/src/testing_old/test_testing_data_topology_stability.conf b/src/testing_old/test_testing_data_topology_stability.conf
index 389c0aa25..aa2cf2cfa 100644
--- a/src/testing_old/test_testing_data_topology_stability.conf
+++ b/src/testing_old/test_testing_data_topology_stability.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
SETTLE_TIME = 600 s
diff --git a/src/testing_old/test_testing_defaults.conf b/src/testing_old/test_testing_defaults.conf
index a28baa7be..dac98aac3 100644
--- a/src/testing_old/test_testing_defaults.conf
+++ b/src/testing_old/test_testing_defaults.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing/
-DEFAULTCONFIG = test_testing_defaults.conf
[resolver]
PORT = 2564
diff --git a/src/testing_old/test_testing_peergroup_data.conf b/src/testing_old/test_testing_peergroup_data.conf
index 880cebf86..f642627a1 100644
--- a/src/testing_old/test_testing_peergroup_data.conf
+++ b/src/testing_old/test_testing_peergroup_data.conf
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_peergroup_data.conf
[TESTING_old]
CONNECT_ATTEMPTS = 2
diff --git a/src/topology/topology.conf b/src/topology/topology.conf
index 39f29219d..15723ee0d 100644
--- a/src/topology/topology.conf
+++ b/src/topology/topology.conf
@@ -4,7 +4,6 @@ FRIENDS-ONLY = NO
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
index ab0c5b391..05309d53c 100644
--- a/src/transport/template_cfg_peer1.conf
+++ b/src/transport/template_cfg_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = template_cfg_peer1.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
index a10dfc488..210ee51c5 100644
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = template_cfg_peer2.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index fdf9fb3b4..189238c08 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
-DEFAULTCONFIG = test_plugin_transport_data.conf
[transport-tcp]
PORT = 2400
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf
index 93f75dd0b..b0fb0e059 100644
--- a/src/transport/test_quota_compliance_data.conf
+++ b/src/transport/test_quota_compliance_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
-DEFAULTCONFIG = test_quota_compliance_data.conf
[transport-tcp]
PORT = 2368
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
index 472e3f74b..885bcba3d 100644
--- a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1
-DEFAULTCONFIG = test_quota_compliance_http_asymmetric_peer1.conf
[transport-http_client]
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
index 48c1a6e83..33f8be543 100644
--- a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_http_asymmetric_peer2.conf
[transport-http_server]
PORT = 3010
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 9f3fa97ad..885bcba3d 100644
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1
-DEFAULTCONFIG = test_quota_compliance_http_peer1.conf
[transport-http_client]
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index 5dd356d96..33f8be543 100644
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
[transport-http_server]
PORT = 3010
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
index 092762781..271bbe056 100644
--- a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer1.conf
[transport-https_client]
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
index 6646a582c..8e07ff337 100644
--- a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer2.conf
[transport-https_server]
PORT = 3001
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index a23b2ad01..271bbe056 100644
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_https_peer1.conf
[transport-https_client]
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index 490b97983..8e07ff337 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
[transport-https_server]
PORT = 3001
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
index 8a1dad5ac..b7eb28757 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
-DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer1.conf
[transport-tcp]
PORT = 4094
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
index bbfa8ec28..cc949df30 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/quota-tcp-p2/
-DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer2.conf
[transport-tcp]
PORT = 12015
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index 29e56fe9b..b7eb28757 100644
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
-DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf
[transport-tcp]
PORT = 4094
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index 5da60d03b..67f171ec9 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf
[transport-tcp]
PORT = 12015
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf
index fceee7bcd..0d49d4ef8 100644
--- a/src/transport/test_quota_compliance_udp_peer1.conf
+++ b/src/transport/test_quota_compliance_udp_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf
[transport-udp]
PORT = 4368
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf
index 4b58c934f..3c57fe5d6 100644
--- a/src/transport/test_quota_compliance_udp_peer2.conf
+++ b/src/transport/test_quota_compliance_udp_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf
[transport-udp]
PORT = 3368
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
index 649cf1c63..1e4afcebc 100644
--- a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_unix_asymmetric_peer1.conf
[arm]
PORT = 4087
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
index a2d1bdd18..f732e98ae 100644
--- a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_unix_asymmetric_peer2.conf
[arm]
PORT = 3087
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf
index 60e656bad..bde78468c 100644
--- a/src/transport/test_quota_compliance_unix_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf
[transport-unix]
PORT = 12120
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf
index b4f0b648a..0b803ccbc 100644
--- a/src/transport/test_quota_compliance_unix_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf
[transport-unix]
PORT = 12136
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
index 9dd9d1bd6..e81a3f9f1 100644
--- a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p1/
-DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
[transport-wlan]
TESTMODE = 1
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
index bc868d7d7..bd5387667 100644
--- a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p2/
-DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
[transport-wlan]
INTERFACE = mon1
diff --git a/src/transport/test_quota_compliance_wlan_peer1.conf b/src/transport/test_quota_compliance_wlan_peer1.conf
index 9dd9d1bd6..e81a3f9f1 100644
--- a/src/transport/test_quota_compliance_wlan_peer1.conf
+++ b/src/transport/test_quota_compliance_wlan_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p1/
-DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
[transport-wlan]
TESTMODE = 1
diff --git a/src/transport/test_quota_compliance_wlan_peer2.conf b/src/transport/test_quota_compliance_wlan_peer2.conf
index bc868d7d7..bd5387667 100644
--- a/src/transport/test_quota_compliance_wlan_peer2.conf
+++ b/src/transport/test_quota_compliance_wlan_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p2/
-DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
[transport-wlan]
INTERFACE = mon1
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer1.conf b/src/transport/test_transport_api_bidirectional_connect_peer1.conf
index 49fc66243..614d89d21 100644
--- a/src/transport/test_transport_api_bidirectional_connect_peer1.conf
+++ b/src/transport/test_transport_api_bidirectional_connect_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = test_transport_api_bidirectional_connect_peer1.conf
[arm]
PORT = 12000
@@ -43,4 +42,4 @@ TIMEOUT = 5 s
[transport-https]
PORT = 12009
-TIMEOUT = 5 s \ No newline at end of file
+TIMEOUT = 5 s
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer2.conf b/src/transport/test_transport_api_bidirectional_connect_peer2.conf
index 2d64351d1..4aeee7c7d 100644
--- a/src/transport/test_transport_api_bidirectional_connect_peer2.conf
+++ b/src/transport/test_transport_api_bidirectional_connect_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_transport_api_bidirectional_connect_peer2.conf
[arm]
PORT = 12010
@@ -42,4 +41,4 @@ TIMEOUT = 5 s
[transport-https]
PORT = 12019
-TIMEOUT = 5 s \ No newline at end of file
+TIMEOUT = 5 s
diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf
index 39552462a..164a38f69 100644
--- a/src/transport/test_transport_api_data.conf
+++ b/src/transport/test_transport_api_data.conf
@@ -1,6 +1,5 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_transport_api_data.conf
[transport-tcp]
PORT = 2094
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf
index ebb4fd469..6879d0534 100644
--- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf
+++ b/src/transport/test_transport_api_disconnect_tcp_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
[transport-tcp]
PORT = 12000
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
index fe6d19b5c..67f171ec9 100644
--- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf
+++ b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
[transport-tcp]
PORT = 12015
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index 4af712a43..e0b60e37f 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p1/
-DEFAULTCONFIG = test_transport_api_http_peer1.conf
[transport-http_client]
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index 62126b07d..4e4c22e30 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p2/
-DEFAULTCONFIG = test_transport_api_http_peer2.conf
[transport-http_server]
PORT = 12090
diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf
index bef99cdac..c38c36a18 100644
--- a/src/transport/test_transport_api_http_reverse_peer1.conf
+++ b/src/transport/test_transport_api_http_reverse_peer1.conf
@@ -1,7 +1,6 @@
INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p1/
-DEFAULTCONFIG = test_transport_api_http_reverse_peer1.conf
[transport-http_client]
diff --git a/src/transport/test_transport_api_http_reverse_peer2.conf b/src/transport/test_transport_api_http_reverse_peer2.conf
index c7e9d4fe1..b73921f94 100644
--- a/src/transport/test_transport_api_http_reverse_peer2.conf
+++ b/src/transport/test_transport_api_http_reverse_peer2.conf
@@ -1,7 +1,6 @@
INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p2/
-DEFAULTCONFIG = test_transport_api_http_reverse_peer2.conf
[transport-http_client]
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf
index b387e5a10..78d3ca0a4 100644
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-https-p1/
-DEFAULTCONFIG = test_transport_api_https_peer1.conf
[transport-https_client]
PORT = 12100
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
index f825c5889..a347887bb 100644
--- a/src/transport/test_transport_api_https_peer2.conf
+++ b/src/transport/test_transport_api_https_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-https-p2/
-DEFAULTCONFIG = test_transport_api_https_peer2.conf
[transport-https_server]
PORT = 12110
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
index d29b9465a..dceeccb9f 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
[transport-tcp]
PORT = 12000
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
index 3c0e49674..caaddded2 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
[transport-tcp]
PORT = 0
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index 9fb57ab37..61b0f5644 100644
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-multi-p1/
-DEFAULTCONFIG = test_transport_api_multi_peer1.conf
[transport-tcp]
PORT = 12140
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index 18e2a5be6..c660c3c41 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-multi-p2/
-DEFAULTCONFIG = test_transport_api_multi_peer2.conf
[nat]
ALLOW_NAT = NO
diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf
index f178b855a..9e39e3e41 100644
--- a/src/transport/test_transport_api_reliability_http_peer1.conf
+++ b/src/transport/test_transport_api_reliability_http_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p1/
-DEFAULTCONFIG = test_transport_api_reliability_http_peer1.conf
[transport-http_client]
diff --git a/src/transport/test_transport_api_reliability_http_peer2.conf b/src/transport/test_transport_api_reliability_http_peer2.conf
index b2d1b338c..3174e3d00 100644
--- a/src/transport/test_transport_api_reliability_http_peer2.conf
+++ b/src/transport/test_transport_api_reliability_http_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p2/
-DEFAULTCONFIG = test_transport_api_reliability_http_peer2.conf
[transport-http_server]
PORT = 12090
diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf
index 4a2c0b5a6..d5e88261a 100644
--- a/src/transport/test_transport_api_reliability_https_peer1.conf
+++ b/src/transport/test_transport_api_reliability_https_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-https-p1/
-DEFAULTCONFIG = test_transport_api_reliability_https_peer1.conf
[transport-https_client]
diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf
index 5a21188da..5cc0d245a 100644
--- a/src/transport/test_transport_api_reliability_https_peer2.conf
+++ b/src/transport/test_transport_api_reliability_https_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-https-p2/
-DEFAULTCONFIG = test_transport_api_reliability_https_peer2.conf
[transport-https_server]
PORT = 12310
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
index ffd3d2f7b..9490d405c 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/
-DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf
[nat]
BEHIND_NAT = YES
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
index c6020ff09..b59916b7f 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/
-DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf
[nat]
DISABLEV6 = YES
diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf
index 3be982dd9..5f1d693a8 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = test_transport_api_reliability_tcp_peer1.conf
[transport-tcp]
PORT = 12000
diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf
index 62575a971..3cb42c0b6 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_transport_api_reliability_tcp_peer2.conf
[transport-tcp]
PORT = 12015
diff --git a/src/transport/test_transport_api_reliability_wlan_peer1.conf b/src/transport/test_transport_api_reliability_wlan_peer1.conf
index 9dd9d1bd6..e81a3f9f1 100644
--- a/src/transport/test_transport_api_reliability_wlan_peer1.conf
+++ b/src/transport/test_transport_api_reliability_wlan_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p1/
-DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
[transport-wlan]
TESTMODE = 1
diff --git a/src/transport/test_transport_api_reliability_wlan_peer2.conf b/src/transport/test_transport_api_reliability_wlan_peer2.conf
index bc868d7d7..bd5387667 100644
--- a/src/transport/test_transport_api_reliability_wlan_peer2.conf
+++ b/src/transport/test_transport_api_reliability_wlan_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p2/
-DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
[transport-wlan]
INTERFACE = mon1
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 73f36f3c2..4ebf5b3be 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/
-DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf
[nat]
BEHIND_NAT = YES
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
index 0bf50fd4b..1ef51c9c9 100644
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/
-DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf
[nat]
DISABLEV6 = YES
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index 9532b730a..54abfa5ba 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
[transport-tcp]
PORT = 12000
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index fe6d19b5c..67f171ec9 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
[transport-tcp]
PORT = 12015
diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf
index cdfbdd9af..2eb23662a 100644
--- a/src/transport/test_transport_api_timeout_http_peer1.conf
+++ b/src/transport/test_transport_api_timeout_http_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p1/
-DEFAULTCONFIG = test_transport_api_timeout_http_peer1.conf
[nat]
diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf
index 6edc9e24a..0aa77a9b9 100644
--- a/src/transport/test_transport_api_timeout_http_peer2.conf
+++ b/src/transport/test_transport_api_timeout_http_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p2/
-DEFAULTCONFIG = test_transport_api_timeout_http_peer2.conf
[nat]
diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf
index c8a26d2af..ff1ef47bd 100644
--- a/src/transport/test_transport_api_timeout_https_peer1.conf
+++ b/src/transport/test_transport_api_timeout_https_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-https-p1/
-DEFAULTCONFIG = test_transport_api_timeout_https_peer1.conf
[transport-https_client]
diff --git a/src/transport/test_transport_api_timeout_https_peer2.conf b/src/transport/test_transport_api_timeout_https_peer2.conf
index 3daf94bb1..35fba0a83 100644
--- a/src/transport/test_transport_api_timeout_https_peer2.conf
+++ b/src/transport/test_transport_api_timeout_https_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-https-p2/
-DEFAULTCONFIG = test_transport_api_timeout_https_peer2.conf
[transport-https_server]
PORT = 12110
diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf
index ecb599f2a..dceeccb9f 100644
--- a/src/transport/test_transport_api_timeout_tcp_peer1.conf
+++ b/src/transport/test_transport_api_timeout_tcp_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = test_transport_api_timeout_tcp_peer1.conf
[transport-tcp]
PORT = 12000
diff --git a/src/transport/test_transport_api_timeout_tcp_peer2.conf b/src/transport/test_transport_api_timeout_tcp_peer2.conf
index ba2e27e57..f89c3a3f7 100644
--- a/src/transport/test_transport_api_timeout_tcp_peer2.conf
+++ b/src/transport/test_transport_api_timeout_tcp_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_transport_api_timeout_tcp_peer2.conf
[nat]
ALLOW_NAT = NO
diff --git a/src/transport/test_transport_api_timeout_udp_peer1.conf b/src/transport/test_transport_api_timeout_udp_peer1.conf
index a1216e4aa..7c3e33ad0 100644
--- a/src/transport/test_transport_api_timeout_udp_peer1.conf
+++ b/src/transport/test_transport_api_timeout_udp_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p1/
-DEFAULTCONFIG = test_transport_api_udp_peer1.conf
[transport-udp]
PORT = 12040
diff --git a/src/transport/test_transport_api_timeout_udp_peer2.conf b/src/transport/test_transport_api_timeout_udp_peer2.conf
index 3e487a6bf..9b79c3b54 100644
--- a/src/transport/test_transport_api_timeout_udp_peer2.conf
+++ b/src/transport/test_transport_api_timeout_udp_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p2/
-DEFAULTCONFIG = test_transport_api_udp_peer2.conf
[transport-udp]
PORT = 12050
diff --git a/src/transport/test_transport_api_timeout_unix_peer1.conf b/src/transport/test_transport_api_timeout_unix_peer1.conf
index b1ace7d4c..5d0235f73 100644
--- a/src/transport/test_transport_api_timeout_unix_peer1.conf
+++ b/src/transport/test_transport_api_timeout_unix_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-unix-p1/
-DEFAULTCONFIG = test_transport_api_unix_peer1.conf
[arm]
PORT = 12125
diff --git a/src/transport/test_transport_api_timeout_unix_peer2.conf b/src/transport/test_transport_api_timeout_unix_peer2.conf
index a15358844..255c7e246 100644
--- a/src/transport/test_transport_api_timeout_unix_peer2.conf
+++ b/src/transport/test_transport_api_timeout_unix_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-unix-p2/
-DEFAULTCONFIG = test_transport_api_unix_peer2.conf
[arm]
PORT = 12135
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index 16a4e6279..6e643d5af 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/
-DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf
[nat]
BEHIND_NAT = YES
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index 0852b25d9..1c1258ad1 100644
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/
-DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf
[nat]
ALLOW_NAT = YES
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf
index a1216e4aa..7c3e33ad0 100644
--- a/src/transport/test_transport_api_udp_peer1.conf
+++ b/src/transport/test_transport_api_udp_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p1/
-DEFAULTCONFIG = test_transport_api_udp_peer1.conf
[transport-udp]
PORT = 12040
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf
index 3e487a6bf..9b79c3b54 100644
--- a/src/transport/test_transport_api_udp_peer2.conf
+++ b/src/transport/test_transport_api_udp_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p2/
-DEFAULTCONFIG = test_transport_api_udp_peer2.conf
[transport-udp]
PORT = 12050
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf
index b1ace7d4c..5d0235f73 100644
--- a/src/transport/test_transport_api_unix_peer1.conf
+++ b/src/transport/test_transport_api_unix_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-unix-p1/
-DEFAULTCONFIG = test_transport_api_unix_peer1.conf
[arm]
PORT = 12125
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf
index a15358844..255c7e246 100644
--- a/src/transport/test_transport_api_unix_peer2.conf
+++ b/src/transport/test_transport_api_unix_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-unix-p2/
-DEFAULTCONFIG = test_transport_api_unix_peer2.conf
[arm]
PORT = 12135
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
index d872f02e7..a4fd104ed 100644
--- a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p1/
-DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer1.conf
[transport-udp]
PORT = 12040
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
index 50ee65acb..755e65dce 100644
--- a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p2/
-DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer2.conf
[transport-udp]
PORT = 12050
diff --git a/src/transport/test_transport_api_unreliability_udp_peer1.conf b/src/transport/test_transport_api_unreliability_udp_peer1.conf
index 8a5a4052e..b9669bf65 100644
--- a/src/transport/test_transport_api_unreliability_udp_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_udp_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p1/
-DEFAULTCONFIG = test_transport_api_unreliability_udp_peer1.conf
[transport-udp]
PORT = 12040
diff --git a/src/transport/test_transport_api_unreliability_udp_peer2.conf b/src/transport/test_transport_api_unreliability_udp_peer2.conf
index d240c42ce..46ad0177d 100644
--- a/src/transport/test_transport_api_unreliability_udp_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_udp_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p2/
-DEFAULTCONFIG = test_transport_api_unreliability_udp_peer2.conf
[transport-udp]
PORT = 12050
diff --git a/src/transport/test_transport_api_unreliability_unix_peer1.conf b/src/transport/test_transport_api_unreliability_unix_peer1.conf
index 8689e415e..5d0235f73 100644
--- a/src/transport/test_transport_api_unreliability_unix_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_unix_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-unix-p1/
-DEFAULTCONFIG = test_transport_api_unreliability_unix_peer1.conf
[arm]
PORT = 12125
diff --git a/src/transport/test_transport_api_unreliability_unix_peer2.conf b/src/transport/test_transport_api_unreliability_unix_peer2.conf
index 7c3cc1953..c9dab48d7 100644
--- a/src/transport/test_transport_api_unreliability_unix_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_unix_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-unix-p2/
-DEFAULTCONFIG = test_transport_api_unreliability_unix_peer2.conf
[arm]
PORT = 12135
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf b/src/transport/test_transport_api_unreliability_wlan_peer1.conf
index 9dd9d1bd6..e81a3f9f1 100644
--- a/src/transport/test_transport_api_unreliability_wlan_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_wlan_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p1/
-DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
[transport-wlan]
TESTMODE = 1
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer2.conf b/src/transport/test_transport_api_unreliability_wlan_peer2.conf
index bc868d7d7..bd5387667 100644
--- a/src/transport/test_transport_api_unreliability_wlan_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_wlan_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p2/
-DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
[transport-wlan]
INTERFACE = mon1
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index e379cf08c..ff37415a4 100644
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p1/
-DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
[transport-wlan]
INTERFACE = mon0
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf
index 3e0ce27d6..87a6036fb 100644
--- a/src/transport/test_transport_api_wlan_peer2.conf
+++ b/src/transport/test_transport_api_wlan_peer2.conf
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p2/
-DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
[transport-wlan]
INTERFACE = mon1
diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf
index 0939a7976..4551bb138 100644
--- a/src/transport/test_transport_defaults.conf
+++ b/src/transport/test_transport_defaults.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-transport-api/
-DEFAULTCONFIG = test_transport_defaults.conf
[transport-tcp]
TIMEOUT = 300 s
diff --git a/src/transport/test_transport_startonly.conf b/src/transport/test_transport_startonly.conf
index 255df4c44..8e161382b 100644
--- a/src/transport/test_transport_startonly.conf
+++ b/src/transport/test_transport_startonly.conf
@@ -1,6 +1,5 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_transport_api_data.conf
[arm]
DEFAULTSERVICES = transport
diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in
index c6c752d8a..46cb9bf17 100644
--- a/src/transport/transport.conf.in
+++ b/src/transport/transport.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
@UNIXONLY@ PORT = 2091
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
#PREFIX = valgrind
NEIGHBOUR_LIMIT = 50
diff --git a/src/util/resolver.conf.in b/src/util/resolver.conf.in
index 7abe1c998..cccb60c2f 100644
--- a/src/util/resolver.conf.in
+++ b/src/util/resolver.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
@JAVAPORT@PORT = 2089
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
diff --git a/src/util/util.conf b/src/util/util.conf
index f3d301e48..1390a866a 100644
--- a/src/util/util.conf
+++ b/src/util/util.conf
@@ -1,8 +1,6 @@
[PATHS]
SERVICEHOME = ~/.gnunet/
# SERVICEHOME = /var/lib/gnunet/
-# DEFAULTCONFIG = /etc/gnunet.conf
-# If 'DEFAULTCONFIG' is not defined, the current
# configuration file is assumed to be the default,
# which is what we want by default...
diff --git a/src/vpn/vpn.conf.in b/src/vpn/vpn.conf.in
index f5eb22447..9080bb439 100644
--- a/src/vpn/vpn.conf.in
+++ b/src/vpn/vpn.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = YES
@UNIXONLY@ PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-vpn
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;