X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdv%2Ftest_transport_dv_data.conf;h=346677a2519a243d765c3c0fb2849fc596327167;hb=37defe2dbd9ea4e5a37710404e8046acbdf4a18e;hp=839cd771a0250e249085e71666f00d1fb0d9fb92;hpb=eea7aa900971469317271dfa56cf04509f5a0bad;p=oweals%2Fgnunet.git

diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 839cd771a..346677a25 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -1,72 +1,12 @@
-[PATHS]
-SERVICEHOME = /tmp/test-gnunet-dv-testing/
+@INLINE@ template_dv.conf
 
 [transport]
 PORT = 2565
 PLUGINS = tcp dv
 
-[arm]
-DEFAULTSERVICES = core
-
 [dv]
 AUTOSTART = YES
 #PREFIX = valgrind 
 
 [set]
 AUTOSTART = YES
-
-[consensus]
-AUTOSTART = NO
-
-[testbed]
-OVERLAY_TOPOLOGY = CLIQUE
-SETUP_TIMEOUT = 30 s
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
-# Topology:
-# 5M-HT
-# HT-P5
-# HT-AG
-# 5M-P5
-# 5M-AG
-# Disallowed: P5-AG => needs DV!
-
-[transport-blacklist-HT3HI3HOVEI05OQANEDN3OELVO8LPS6DDGVI612TKMH0TA1R06NGB197LS0HGSIA4BQVBA93S6PCU4M70NN6GSLLML6ADI2CV5KIIE0]
-
-[transport-blacklist-P565723JO1C2HSN6J29TAQ22MN6CI8HTMUU55T0FUQG4CMDGGEQ8UCNBKUMB94GC8R9G4FB2SF9LDOBAJ6AMINBP4JHHDD6L7VD801G]
-# forbid P565 to talk to AG2P via TCP to force DV @ distance 2
-AG2PHES1BARB9IJCPAMJTFPVJ5V3A72S3F2A8SBUB8DAQ2V0O3V8G6G2JU56FHGFOHMQVKBSQFV98TCGTC3RJ1NINP82G0RC00N1520 = tcp
-
-[transport-blacklist-AG2PHES1BARB9IJCPAMJTFPVJ5V3A72S3F2A8SBUB8DAQ2V0O3V8G6G2JU56FHGFOHMQVKBSQFV98TCGTC3RJ1NINP82G0RC00N1520]
-
-# forbid P565 to talk to AG2P via TCP to force DV @ distance 2 (again, just to be sure)
-P565723JO1C2HSN6J29TAQ22MN6CI8HTMUU55T0FUQG4CMDGGEQ8UCNBKUMB94GC8R9G4FB2SF9LDOBAJ6AMINBP4JHHDD6L7VD801G = tcp
-
-[transport-blacklist-5MBMI6V7A8UFH0BD965HNNAQEDBIQRCC4LDNT9Q7KMEAQU00VEJFEQKDU4KCL9E64ACCRO0PJ1C689K765NCAHFUVSV99Q15KPK1RRO]
-