aboutsummaryrefslogtreecommitdiff
path: root/src/topology
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-12-10 17:11:06 +0000
committerChristian Grothoff <christian@grothoff.org>2014-12-10 17:11:06 +0000
commitb8fc68d6cb81adb3803186359b3a30b1a4bb7b5a (patch)
treebe6defbdf18e3af9bdcc979cf27b253fe0b4d5f9 /src/topology
parent3871fc32bbd05da817d94f4188023a4edebc367a (diff)
downloadgnunet-b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a.tar.gz
gnunet-b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a.zip
moving away from DEFAULTSERVICES to per-section FORCESTART, thus addressing #3565 indirectly
Diffstat (limited to 'src/topology')
-rw-r--r--src/topology/test_gnunet_daemon_topology_data.conf45
-rw-r--r--src/topology/topology.conf1
2 files changed, 1 insertions, 45 deletions
diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf
index 79f12e5e1..a413ab72c 100644
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf
@@ -1,27 +1,15 @@
1[PATHS] 1[PATHS]
2GNUNET_TEST_HOME = /tmp/test-gnunet-topology/ 2GNUNET_TEST_HOME = /tmp/test-gnunet-topology/
3 3
4[resolver]
5PORT = 2664
6
7[transport] 4[transport]
8PORT = 2665
9PLUGINS = tcp 5PLUGINS = tcp
10#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args 6#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
11#PREFIX = valgrind --tool=memcheck --log-file=logs%p 7#PREFIX = valgrind --tool=memcheck --log-file=logs%p
12 8
13[arm]
14PORT = 2666
15DEFAULTSERVICES = topology
16
17[testbed] 9[testbed]
18OVERLAY_TOPOLOGY=LINE 10OVERLAY_TOPOLOGY=LINE
19 11
20[statistics]
21PORT = 2667
22
23[transport-tcp] 12[transport-tcp]
24PORT = 2668
25BINDTO = 127.0.0.1 13BINDTO = 127.0.0.1
26 14
27[nat] 15[nat]
@@ -34,36 +22,3 @@ EXTERNAL_ADDRESS = 127.0.0.1
34USE_LOCALADDR = NO 22USE_LOCALADDR = NO
35USE_HOSTNAME = NO 23USE_HOSTNAME = NO
36 24
37[peerinfo]
38PORT = 2669
39
40[core]
41PORT = 2670
42
43[topology]
44#PREFIX = valgrind --tool=memcheck
45
46[fs]
47AUTOSTART = NO
48
49[datastore]
50AUTOSTART = NO
51
52[testing]
53WEAKRANDOM = YES
54
55[testing_old]
56HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
57
58[dns]
59AUTOSTART = NO
60
61[namestore]
62AUTOSTART = NO
63
64[nse]
65AUTOSTART = NO
66
67[consensus]
68AUTOSTART = NO
69
diff --git a/src/topology/topology.conf b/src/topology/topology.conf
index 5e72d57ce..79dd52347 100644
--- a/src/topology/topology.conf
+++ b/src/topology/topology.conf
@@ -1,4 +1,5 @@
1[topology] 1[topology]
2FORCESTART = YES
2MINIMUM-FRIENDS = 0 3MINIMUM-FRIENDS = 0
3FRIENDS-ONLY = NO 4FRIENDS-ONLY = NO
4TARGET-CONNECTION-COUNT = 16 5TARGET-CONNECTION-COUNT = 16