simplifying configs

1 files changed, 10 insertions, 56 deletions

diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf
index 3eb66afad..8271ea96a 100644
--- a/src/core/test_core_api_send_to_self.conf
+++ b/src/core/test_core_api_send_to_self.conf
@@ -1,34 +1,21 @@
+@INLINE@ test_core_defaults.conf
 [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...
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[TESTING]
-WEAKRANDOM = NO
-
-[client]
-HOME = $SERVICEHOME
+DEFAULTCONFIG = test_core_api_send_to_self.conf
 
 [arm]
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
+PORT = 2425 
 DEFAULTSERVICES = core test-sts
-UNIXPATH = /tmp/gnunet-service-arm.sock
+
+[core]
+PORT = 24512
+TOTAL_QUOTA_IN = 104857600
+TOTAL_QUOTA_OUT = 104757600
+UNIXPATH = /tmp/gnunet-service-core.sock
 
 [test-sts]
 AUTOSTART = YES
-PORT = 0
+PORT = 9252 
 HOSTNAME = localhost
 HOME = $SERVICEHOME
 CONFIG = $DEFAULTCONFIG
@@ -38,37 +25,4 @@ ACCEPT_FROM6 = ::1;
 TOTAL_QUOTA_IN = 65536
 TOTAL_QUOTA_OUT = 65536
 UNIXPATH = /tmp/gnunet-service-sts.sock
-#DEBUG = YES
-
-[core]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-# quotas are in bytes per second now!
-TOTAL_QUOTA_IN = 104857600
-TOTAL_QUOTA_OUT = 104757600
-UNIXPATH = /tmp/gnunet-service-core.sock
-# DEBUG = YES
-# USERNAME = 
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-