From e04b3d81b8fafd6df42755db513d3cc68433d5b1 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 14 Sep 2011 12:40:08 +0000
Subject: simplifying configs

---
 src/datastore/test_datastore_api_data_sqlite.conf | 54 ++++-------------------
 1 file changed, 9 insertions(+), 45 deletions(-)

(limited to 'src/datastore/test_datastore_api_data_sqlite.conf')

diff --git a/src/datastore/test_datastore_api_data_sqlite.conf b/src/datastore/test_datastore_api_data_sqlite.conf
index 049068333..eaf4f2b5c 100644
--- a/src/datastore/test_datastore_api_data_sqlite.conf
+++ b/src/datastore/test_datastore_api_data_sqlite.conf
@@ -1,60 +1,24 @@
+@INLINE@ test_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/
+DEFAULTCONFIG = test_datastore_api_data_sqlite.conf
+
+[TESTING]
+WEAKRANDOM = YES
 
 [arm]
-DEFAULTSERVICES = 
 PORT = 42466
-HOSTNAME = localhost
+DEFAULTSERVICES = 
+
+[statistics]
+PORT = 22667
 
 [resolver]
 PORT = 42464
-HOSTNAME = localhost
 
 [datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
 QUOTA = 10000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-# USERNAME = 
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-datastore
-
-[statistics]
-PORT = 22667
-HOSTNAME = localhost
-
-[testing]
-WEAKRANDOM = YES
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
 
 [fs]
 AUTOSTART = NO
 
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-
-- 
cgit v1.2.3