diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-10 17:11:06 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-10 17:11:06 +0000 |
commit | b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a (patch) | |
tree | be6defbdf18e3af9bdcc979cf27b253fe0b4d5f9 /src/core | |
parent | 3871fc32bbd05da817d94f4188023a4edebc367a (diff) | |
download | gnunet-b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a.tar.gz gnunet-b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a.zip |
moving away from DEFAULTSERVICES to per-section FORCESTART, thus addressing #3565 indirectly
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/test_core_api_data.conf | 3 | ||||
-rw-r--r-- | src/core/test_core_api_send_to_self.conf | 14 | ||||
-rw-r--r-- | src/core/test_core_defaults.conf | 72 |
3 files changed, 2 insertions, 87 deletions
diff --git a/src/core/test_core_api_data.conf b/src/core/test_core_api_data.conf index 4ece5b096..a13cc8706 100644 --- a/src/core/test_core_api_data.conf +++ b/src/core/test_core_api_data.conf | |||
@@ -1,9 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | 3 | ||
4 | [arm] | ||
5 | DEFAULTSERVICES = topology hostlist | ||
6 | |||
7 | [ats] | 4 | [ats] |
8 | WAN_QUOTA_IN = 64 kiB | 5 | WAN_QUOTA_IN = 64 kiB |
9 | WAN_QUOTA_OUT = 64 kiB | 6 | WAN_QUOTA_OUT = 64 kiB |
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf index ebf77997c..83928d04a 100644 --- a/src/core/test_core_api_send_to_self.conf +++ b/src/core/test_core_api_send_to_self.conf | |||
@@ -2,23 +2,13 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = ~/.gnunet/ | 3 | GNUNET_TEST_HOME = ~/.gnunet/ |
4 | 4 | ||
5 | [arm] | ||
6 | PORT = 2425 | ||
7 | DEFAULTSERVICES = core test-sts | ||
8 | |||
9 | [core] | ||
10 | PORT = 24512 | ||
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock | ||
12 | |||
13 | [ats] | 5 | [ats] |
14 | WAN_QUOTA_IN = 104857600 | 6 | WAN_QUOTA_IN = 104857600 |
15 | WAN_QUOTA_OUT = 104757600 | 7 | WAN_QUOTA_OUT = 104757600 |
16 | PORT = 24571 | ||
17 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock | ||
18 | 8 | ||
19 | [test-sts] | 9 | [test-sts] |
20 | AUTOSTART = YES | 10 | FORCESTART = YES |
21 | PORT = 9252 | 11 | PORT = 9252 |
22 | HOSTNAME = localhost | 12 | HOSTNAME = localhost |
23 | BINARY = test_core_api_send_to_self | 13 | BINARY = test_core_api_send_to_self |
24 | ACCEPT_FROM = 127.0.0.1; | 14 | ACCEPT_FROM = 127.0.0.1; |
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf index b0acb8395..2184e103a 100644 --- a/src/core/test_core_defaults.conf +++ b/src/core/test_core_defaults.conf | |||
@@ -1,9 +1,6 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | GNUNET_TEST_HOME = /tmp/test-gnunet-core/ | 2 | GNUNET_TEST_HOME = /tmp/test-gnunet-core/ |
3 | 3 | ||
4 | [arm] | ||
5 | DEFAULTSERVICES = | ||
6 | |||
7 | [nat] | 4 | [nat] |
8 | DISABLEV6 = YES | 5 | DISABLEV6 = YES |
9 | ENABLE_UPNP = NO | 6 | ENABLE_UPNP = NO |
@@ -17,81 +14,12 @@ USE_LOCALADDR = NO | |||
17 | WAN_QUOTA_IN = 1 GB | 14 | WAN_QUOTA_IN = 1 GB |
18 | WAN_QUOTA_OUT = 1 GB | 15 | WAN_QUOTA_OUT = 1 GB |
19 | 16 | ||
20 | [core] | ||
21 | PORT = 12470 | ||
22 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock | ||
23 | |||
24 | [transport-tcp] | 17 | [transport-tcp] |
25 | BINDTO = 127.0.0.1 | 18 | BINDTO = 127.0.0.1 |
26 | 19 | ||
27 | [transport-udp] | 20 | [transport-udp] |
28 | BROADCAST = NO | 21 | BROADCAST = NO |
29 | 22 | ||
30 | [testing] | ||
31 | WEAKRANDOM = YES | ||
32 | |||
33 | [peerinfo] | 23 | [peerinfo] |
34 | NO_IO = YES | 24 | NO_IO = YES |
35 | 25 | ||
36 | [fs] | ||
37 | AUTOSTART = NO | ||
38 | |||
39 | [datastore] | ||
40 | AUTOSTART = NO | ||
41 | |||
42 | [dht] | ||
43 | AUTOSTART = NO | ||
44 | |||
45 | [cadet] | ||
46 | AUTOSTART = NO | ||
47 | |||
48 | [dns] | ||
49 | AUTOSTART = NO | ||
50 | |||
51 | [nse] | ||
52 | AUTOSTART = NO | ||
53 | |||
54 | [dv] | ||
55 | AUTOSTART = NO | ||
56 | |||
57 | [chat] | ||
58 | AUTOSTART = NO | ||
59 | |||
60 | [gns] | ||
61 | AUTOSTART = NO | ||
62 | |||
63 | [vpn] | ||
64 | AUTOSTART = NO | ||
65 | |||
66 | [namestore] | ||
67 | AUTOSTART = NO | ||
68 | |||
69 | [lockmanager] | ||
70 | AUTOSTART = NO | ||
71 | |||
72 | [consensus] | ||
73 | AUTOSTART = NO | ||
74 | |||
75 | [regex] | ||
76 | AUTOSTART = NO | ||
77 | |||
78 | [identity] | ||
79 | AUTOSTART = NO | ||
80 | |||
81 | [psycstore] | ||
82 | AUTOSTART = NO | ||
83 | |||
84 | [multicast] | ||
85 | AUTOSTART = NO | ||
86 | |||
87 | [revocation] | ||
88 | AUTOSTART = NO | ||
89 | |||
90 | [conversation] | ||
91 | AUTOSTART = NO | ||
92 | |||
93 | [namecache] | ||
94 | AUTOSTART = NO | ||
95 | |||
96 | [set] | ||
97 | AUTOSTART = NO | ||