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

12 files changed, 4 insertions, 17 deletions

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