psyc/social: local join flag; social service: leave place, save _file

[oweals/gnunet.git] / src / regex / test_regex_api_data.conf

diff --git a/src/regex/test_regex_api_data.conf b/src/regex/test_regex_api_data.conf
index 87935261c663379ef146c08ef3f5800d379b7d9f..84df062387755640181239781a9e2bb3f9b2eaf8 100644 (file)
--- a/src/regex/test_regex_api_data.conf
+++ b/src/regex/test_regex_api_data.conf
@@ -1,14 +1,8 @@
-[PATHS]
-SERVICEHOME = /tmp/test-regex-api/
-
-[fs]
-AUTOSTART = NO
+@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
 
-[resolver]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-regex-api/
 
 [dhtcache]
 QUOTA = 1 MB
@@ -24,36 +18,16 @@ MINIMUM-FRIENDS = 0
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[core]
-PORT = 2092
-
 [dht]
+AUTOSTART = YES
 PORT = 12370
 
+[regex]
+AUTOSTART = YES
+
 [transport]
 plugins = tcp
 NEIGHBOUR_LIMIT = 50
-PORT = 2091
-
-[peerinfo]
-PORT = 2090
-
-[resolver]
-PORT = 2089
-
-[statistics]
-PORT = 2088
-
-[arm]
-DEFAULTSERVICES = 
-PORT = 2087
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 2094
-
-[TESTING]
-WEAKRANDOM = NO
 
 [nat]
 DISABLEV6 = YES
@@ -63,15 +37,3 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
-
-[dns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART=NO