diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-12-17 16:20:05 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-12-17 16:20:05 +0000 |
commit | 9945ef17c41da515ab9ce9c1657ad66728d89ded (patch) | |
tree | 4feec4b829c3421867fc01e6cc8b3e61d80d2284 /src/integration-tests | |
parent | 4c0cd0fc1dbd50d8189256d7d4fd801ac9355e69 (diff) | |
download | gnunet-9945ef17c41da515ab9ce9c1657ad66728d89ded.tar.gz gnunet-9945ef17c41da515ab9ce9c1657ad66728d89ded.zip |
clean up for configs
Diffstat (limited to 'src/integration-tests')
-rw-r--r-- | src/integration-tests/confs/c_nat_client.conf | 2 | ||||
-rw-r--r-- | src/integration-tests/confs/test_defaults.conf | 64 |
2 files changed, 29 insertions, 37 deletions
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf index d4126a8b5..e8cdf6fa8 100644 --- a/src/integration-tests/confs/c_nat_client.conf +++ b/src/integration-tests/confs/c_nat_client.conf | |||
@@ -10,7 +10,7 @@ PRIVATE_KEY = hostkeys/c_nat_client | |||
10 | [transport] | 10 | [transport] |
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50 | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50 |
12 | PORT = 20065 | 12 | PORT = 20065 |
13 | PLUGINS = tcp udp | 13 | PLUGINS = tcp udp http_client https_client |
14 | 14 | ||
15 | [transport-tcp] | 15 | [transport-tcp] |
16 | PORT = 0 | 16 | PORT = 0 |
diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf index d1229262b..4477b296e 100644 --- a/src/integration-tests/confs/test_defaults.conf +++ b/src/integration-tests/confs/test_defaults.conf | |||
@@ -1,8 +1,24 @@ | |||
1 | [arm] | 1 | [arm] |
2 | DEFAULTSERVICES = topology hostlist fs | 2 | DEFAULTSERVICES = topology hostlist fs |
3 | 3 | ||
4 | [namestore] | 4 | [peerinfo] |
5 | AUTOSTART = NO | 5 | USE_INCLUDED_HELLOS = NO |
6 | |||
7 | [transport-tcp] | ||
8 | USE_LOCALADDR = YES | ||
9 | |||
10 | [transport-udp] | ||
11 | BROADCAST = NO | ||
12 | USE_LOCALADDR = YES | ||
13 | |||
14 | [nat] | ||
15 | BEHIND_NAT = NO | ||
16 | EXTERNAL_ADDRESS = 127.0.0.1 | ||
17 | INTERNAL_ADDRESS = 127.0.0.1 | ||
18 | BINDTO = 127.0.0.1 | ||
19 | |||
20 | [hostlist] | ||
21 | SERVERS = | ||
6 | 22 | ||
7 | [dns] | 23 | [dns] |
8 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-47 | 24 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-47 |
@@ -11,22 +27,12 @@ ACCEPT_FROM = 127.0.0.1; | |||
11 | ACCEPT_FROM6 = ::1; | 27 | ACCEPT_FROM6 = ::1; |
12 | PROVIDE_EXIT = NO | 28 | PROVIDE_EXIT = NO |
13 | 29 | ||
14 | [consensus] | ||
15 | AUTOSTART = NO | ||
16 | |||
17 | [lockmanager] | ||
18 | AUTOSTART = NO | ||
19 | |||
20 | [ats] | 30 | [ats] |
21 | WAN_QUOTA_IN = unlimited | 31 | WAN_QUOTA_IN = unlimited |
22 | WAN_QUOTA_OUT = unlimited | 32 | WAN_QUOTA_OUT = unlimited |
23 | ATS_MIN_INTERVAL = 15000 | 33 | ATS_MIN_INTERVAL = 15000 |
24 | ATS_EXEC_INTERVAL = 30000 | 34 | ATS_EXEC_INTERVAL = 30000 |
25 | 35 | ||
26 | [mesh] | ||
27 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-55 | ||
28 | PORT = 20070 | ||
29 | |||
30 | [datastore] | 36 | [datastore] |
31 | UNIX_MATCH_UID = YES | 37 | UNIX_MATCH_UID = YES |
32 | QUOTA = 100 MB | 38 | QUOTA = 100 MB |
@@ -39,12 +45,6 @@ QUOTA = 1 MB | |||
39 | [TESTING] | 45 | [TESTING] |
40 | WEAKRANDOM = NO | 46 | WEAKRANDOM = NO |
41 | 47 | ||
42 | [nat] | ||
43 | BEHIND_NAT = NO | ||
44 | EXTERNAL_ADDRESS = 127.0.0.1 | ||
45 | INTERNAL_ADDRESS = 127.0.0.1 | ||
46 | BINDTO = 127.0.0.1 | ||
47 | |||
48 | [fs] | 48 | [fs] |
49 | INDEXDB = $GNUNET_TEST_HOME/idxinfo.lst | 49 | INDEXDB = $GNUNET_TEST_HOME/idxinfo.lst |
50 | IDENTITY_DIR = $GNUNET_TEST_HOME/identities/ | 50 | IDENTITY_DIR = $GNUNET_TEST_HOME/identities/ |
@@ -52,27 +52,20 @@ STATE_DIR = $GNUNET_TEST_HOME/persistence/ | |||
52 | UPDATE_DIR = $GNUNET_TEST_HOME/updates/ | 52 | UPDATE_DIR = $GNUNET_TEST_HOME/updates/ |
53 | TRUST = $GNUNET_TEST_HOME/data/credit/ | 53 | TRUST = $GNUNET_TEST_HOME/data/credit/ |
54 | 54 | ||
55 | [transport-tcp] | 55 | [mesh] |
56 | USE_LOCALADDR = YES | 56 | AUTOSTART = NO |
57 | |||
58 | [transport-udp] | ||
59 | BROADCAST = NO | ||
60 | BROADCAST_INTERVAL = 30000 | ||
61 | USE_LOCALADDR = YES | ||
62 | 57 | ||
63 | [hostlist] | 58 | [consensus] |
64 | SERVERS = | 59 | AUTOSTART = NO |
65 | 60 | ||
66 | [vpn] | 61 | [lockmanager] |
67 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-57 | 62 | AUTOSTART = NO |
68 | PORT = 0 | ||
69 | 63 | ||
70 | [peerinfo] | 64 | [namestore] |
71 | USE_INCLUDED_HELLOS = NO | 65 | AUTOSTART = NO |
72 | 66 | ||
73 | [statistics] | 67 | [vpn] |
74 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-44 | 68 | AUTOSTART = NO |
75 | PORT = 20055 | ||
76 | 69 | ||
77 | [template] | 70 | [template] |
78 | AUTOSTART = NO | 71 | AUTOSTART = NO |
@@ -114,7 +107,6 @@ AUTOSTART = NO | |||
114 | [gns] | 107 | [gns] |
115 | AUTOSTART = NO | 108 | AUTOSTART = NO |
116 | 109 | ||
117 | |||
118 | [datacache-mysql] | 110 | [datacache-mysql] |
119 | DATABASE = gnunet | 111 | DATABASE = gnunet |
120 | CONFIG = ~/.my.cnf | 112 | CONFIG = ~/.my.cnf |