diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-09 18:38:01 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-09 18:38:01 +0000 |
commit | b581097addc91044432dcb54ce7cff26b9e12de1 (patch) | |
tree | dafeebf08b90707d2cbfb6f5ab75c361ba298d6e /src/dht | |
parent | 81dcb0a35beb7c862ac6f2677933b978aab67038 (diff) | |
download | gnunet-b581097addc91044432dcb54ce7cff26b9e12de1.tar.gz gnunet-b581097addc91044432dcb54ce7cff26b9e12de1.zip |
-getting rid of silly, stupid, useless, often wrong DEFAULTCONFIG setting
Diffstat (limited to 'src/dht')
-rw-r--r-- | src/dht/dht.conf.in | 1 | ||||
-rw-r--r-- | src/dht/test_dht_2dtorus.conf | 1 | ||||
-rw-r--r-- | src/dht/test_dht_api_data.conf | 1 | ||||
-rw-r--r-- | src/dht/test_dht_api_peer1.conf | 1 | ||||
-rw-r--r-- | src/dht/test_dht_line.conf | 1 | ||||
-rw-r--r-- | src/dht/test_dht_multipeer_data.conf | 5 | ||||
-rw-r--r-- | src/dht/test_dht_twopeer_data.conf | 1 |
7 files changed, 0 insertions, 11 deletions
diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in index 36af99895..bcc0192ab 100644 --- a/src/dht/dht.conf.in +++ b/src/dht/dht.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = YES | |||
3 | @JAVAPORT@PORT = 2095 | 3 | @JAVAPORT@PORT = 2095 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-dht | 6 | BINARY = gnunet-service-dht |
8 | ACCEPT_FROM = 127.0.0.1; | 7 | ACCEPT_FROM = 127.0.0.1; |
9 | ACCEPT_FROM6 = ::1; | 8 | ACCEPT_FROM6 = ::1; |
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf index 82b930188..fa8c25011 100644 --- a/src/dht/test_dht_2dtorus.conf +++ b/src/dht/test_dht_2dtorus.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test_dht_topo/ | 2 | SERVICEHOME = /tmp/test_dht_topo/ |
3 | DEFAULTCONFIG = test_dht_2dtours.conf | ||
4 | 3 | ||
5 | [arm] | 4 | [arm] |
6 | PORT = 10010 | 5 | PORT = 10010 |
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf index 8d4f8c63c..42ccf9687 100644 --- a/src/dht/test_dht_api_data.conf +++ b/src/dht/test_dht_api_data.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-dht-api/ | 2 | SERVICEHOME = /tmp/test-dht-api/ |
3 | DEFAULTCONFIG = test_dht_api_data.conf | ||
4 | 3 | ||
5 | [fs] | 4 | [fs] |
6 | AUTOSTART = NO | 5 | AUTOSTART = NO |
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf index e56024c0d..eea39e031 100644 --- a/src/dht/test_dht_api_peer1.conf +++ b/src/dht/test_dht_api_peer1.conf | |||
@@ -52,7 +52,6 @@ WEAKRANDOM = YES | |||
52 | HOSTKEY = $SERVICEHOME/.hostkey | 52 | HOSTKEY = $SERVICEHOME/.hostkey |
53 | 53 | ||
54 | [PATHS] | 54 | [PATHS] |
55 | DEFAULTCONFIG = test_dht_api_peer1.conf | ||
56 | SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/ | 55 | SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/ |
57 | 56 | ||
58 | 57 | ||
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf index ff34a3c25..0ce4a4e9b 100644 --- a/src/dht/test_dht_line.conf +++ b/src/dht/test_dht_line.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test_dht_topo/ | 2 | SERVICEHOME = /tmp/test_dht_topo/ |
3 | DEFAULTCONFIG = test_dht_line.conf | ||
4 | 3 | ||
5 | [arm] | 4 | [arm] |
6 | PORT = 10010 | 5 | PORT = 10010 |
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf index 9cb87d248..999ed3807 100644 --- a/src/dht/test_dht_multipeer_data.conf +++ b/src/dht/test_dht_multipeer_data.conf | |||
@@ -13,7 +13,6 @@ ACCEPT_FROM = 127.0.0.1; | |||
13 | #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dht/.libs/gnunet-service-dht | 13 | #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dht/.libs/gnunet-service-dht |
14 | #PREFIX = xterm -T dht -e gdb --args | 14 | #PREFIX = xterm -T dht -e gdb --args |
15 | #PREFIX = valgrind --log-file=dht_%p | 15 | #PREFIX = valgrind --log-file=dht_%p |
16 | CONFIG = $DEFAULTCONFIG | ||
17 | HOME = $SERVICEHOME | 16 | HOME = $SERVICEHOME |
18 | HOSTNAME = localhost | 17 | HOSTNAME = localhost |
19 | PORT = 12100 | 18 | PORT = 12100 |
@@ -37,7 +36,6 @@ ACCEPT_FROM6 = ::1; | |||
37 | ACCEPT_FROM = 127.0.0.1; | 36 | ACCEPT_FROM = 127.0.0.1; |
38 | NEIGHBOUR_LIMIT = 50 | 37 | NEIGHBOUR_LIMIT = 50 |
39 | BINARY = gnunet-service-transport | 38 | BINARY = gnunet-service-transport |
40 | CONFIG = $DEFAULTCONFIG | ||
41 | HOME = $SERVICEHOME | 39 | HOME = $SERVICEHOME |
42 | HOSTNAME = localhost | 40 | HOSTNAME = localhost |
43 | PORT = 12365 | 41 | PORT = 12365 |
@@ -53,7 +51,6 @@ WAN_QUOTA_OUT = 1 GB | |||
53 | ACCEPT_FROM6 = ::1; | 51 | ACCEPT_FROM6 = ::1; |
54 | ACCEPT_FROM = 127.0.0.1; | 52 | ACCEPT_FROM = 127.0.0.1; |
55 | BINARY = gnunet-service-core | 53 | BINARY = gnunet-service-core |
56 | CONFIG = $DEFAULTCONFIG | ||
57 | HOME = $SERVICEHOME | 54 | HOME = $SERVICEHOME |
58 | HOSTNAME = localhost | 55 | HOSTNAME = localhost |
59 | PORT = 12092 | 56 | PORT = 12092 |
@@ -64,7 +61,6 @@ DEFAULTSERVICES = dht core | |||
64 | ACCEPT_FROM6 = ::1; | 61 | ACCEPT_FROM6 = ::1; |
65 | ACCEPT_FROM = 127.0.0.1; | 62 | ACCEPT_FROM = 127.0.0.1; |
66 | BINARY = gnunet-service-arm | 63 | BINARY = gnunet-service-arm |
67 | CONFIG = $DEFAULTCONFIG | ||
68 | HOME = $SERVICEHOME | 64 | HOME = $SERVICEHOME |
69 | HOSTNAME = localhost | 65 | HOSTNAME = localhost |
70 | PORT = 12366 | 66 | PORT = 12366 |
@@ -107,7 +103,6 @@ HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat | |||
107 | HOSTKEY = $SERVICEHOME/.hostkey | 103 | HOSTKEY = $SERVICEHOME/.hostkey |
108 | 104 | ||
109 | [PATHS] | 105 | [PATHS] |
110 | DEFAULTCONFIG = test_dht_multipeer_data.conf | ||
111 | SERVICEHOME = /tmp/test-dht-multipeer/ | 106 | SERVICEHOME = /tmp/test-dht-multipeer/ |
112 | 107 | ||
113 | [nat] | 108 | [nat] |
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf index 809338834..51e7a6b8e 100644 --- a/src/dht/test_dht_twopeer_data.conf +++ b/src/dht/test_dht_twopeer_data.conf | |||
@@ -1,5 +1,4 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | DEFAULTCONFIG = test_dht_twopeer_data.conf | ||
3 | SERVICEHOME = /tmp/test-dht-twopeer/ | 2 | SERVICEHOME = /tmp/test-dht-twopeer/ |
4 | 3 | ||
5 | [resolver] | 4 | [resolver] |