diff options
220 files changed, 13 insertions, 485 deletions
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in index 316f0e49a..e7620b8ff 100644 --- a/src/arm/arm.conf.in +++ b/src/arm/arm.conf.in | |||
@@ -3,7 +3,6 @@ | |||
3 | @UNIXONLY@ PORT = 2087 | 3 | @UNIXONLY@ PORT = 2087 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-arm | 6 | BINARY = gnunet-service-arm |
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/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf index 7d56e65fc..cbadc47d2 100644 --- a/src/arm/test_arm_api_data.conf +++ b/src/arm/test_arm_api_data.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunetd-arm/ | 2 | SERVICEHOME = /tmp/test-gnunetd-arm/ |
3 | DEFAULTCONFIG = test_arm_api_data.conf | ||
4 | 3 | ||
5 | [arm] | 4 | [arm] |
6 | PORT = 23354 | 5 | PORT = 23354 |
@@ -21,7 +20,6 @@ AUTOSTART = NO | |||
21 | PORT = 2223 | 20 | PORT = 2223 |
22 | HOSTNAME = localhost | 21 | HOSTNAME = localhost |
23 | HOME = $SERVICEHOME | 22 | HOME = $SERVICEHOME |
24 | CONFIG = $DEFAULTCONFIG | ||
25 | BINARY = mockup-service | 23 | BINARY = mockup-service |
26 | ACCEPT_FROM = 127.0.0.1; | 24 | ACCEPT_FROM = 127.0.0.1; |
27 | ACCEPT_FROM6 = ::1; | 25 | ACCEPT_FROM6 = ::1; |
diff --git a/src/ats-test/test_transport_ats_1addr.conf b/src/ats-test/test_transport_ats_1addr.conf index e01f743d2..311e5f00d 100644 --- a/src/ats-test/test_transport_ats_1addr.conf +++ b/src/ats-test/test_transport_ats_1addr.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-testing/ | 3 | SERVICEHOME = /tmp/test-gnunet-testing/ |
4 | DEFAULTCONFIG = test_testing_data.conf | ||
5 | 4 | ||
6 | [TESTING] | 5 | [TESTING] |
7 | HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat | 6 | HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat |
diff --git a/src/ats-test/test_transport_ats_2addr.conf b/src/ats-test/test_transport_ats_2addr.conf index ce7d104ae..0571dbf21 100644 --- a/src/ats-test/test_transport_ats_2addr.conf +++ b/src/ats-test/test_transport_ats_2addr.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-testing/ | 3 | SERVICEHOME = /tmp/test-gnunet-testing/ |
4 | DEFAULTCONFIG = test_testing_data.conf | ||
5 | 4 | ||
6 | [TESTING] | 5 | [TESTING] |
7 | HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat | 6 | HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat |
diff --git a/src/ats-test/test_transport_ats_4addr.conf b/src/ats-test/test_transport_ats_4addr.conf index cd224e6b0..e4b4863b3 100644 --- a/src/ats-test/test_transport_ats_4addr.conf +++ b/src/ats-test/test_transport_ats_4addr.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-testing/ | 3 | SERVICEHOME = /tmp/test-gnunet-testing/ |
4 | DEFAULTCONFIG = test_testing_data.conf | ||
5 | 4 | ||
6 | [TESTING] | 5 | [TESTING] |
7 | HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat | 6 | HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat |
diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in index f81016e2b..d99708174 100644 --- a/src/ats/ats.conf.in +++ b/src/ats/ats.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = YES | |||
3 | @UNIXONLY@ PORT = 2098 | 3 | @UNIXONLY@ PORT = 2098 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-ats | 6 | BINARY = gnunet-service-ats |
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/ats/test_ats_api.conf b/src/ats/test_ats_api.conf index efd7fc9c6..ab96f655e 100644 --- a/src/ats/test_ats_api.conf +++ b/src/ats/test_ats_api.conf | |||
@@ -13,7 +13,6 @@ AUTOSTART = YES | |||
13 | PORT = 12002 | 13 | PORT = 12002 |
14 | HOSTNAME = localhost | 14 | HOSTNAME = localhost |
15 | HOME = $SERVICEHOME | 15 | HOME = $SERVICEHOME |
16 | CONFIG = $DEFAULTCONFIG | ||
17 | BINARY = gnunet-service-ats | 16 | BINARY = gnunet-service-ats |
18 | ACCEPT_FROM = 127.0.0.1; | 17 | ACCEPT_FROM = 127.0.0.1; |
19 | ACCEPT_FROM6 = ::1; | 18 | ACCEPT_FROM6 = ::1; |
diff --git a/src/chat/chat.conf.in b/src/chat/chat.conf.in index 41fe9b4f7..560931e67 100644 --- a/src/chat/chat.conf.in +++ b/src/chat/chat.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = YES | |||
3 | @UNIXONLY@ PORT = 2090 | 3 | @UNIXONLY@ PORT = 2090 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-chat | 6 | BINARY = gnunet-service-chat |
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/chat/test_chat_data.conf b/src/chat/test_chat_data.conf index 3052a4f55..77446151b 100644 --- a/src/chat/test_chat_data.conf +++ b/src/chat/test_chat_data.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-chat/ | 2 | SERVICEHOME = /tmp/gnunet-test-chat/ |
3 | DEFAULTCONFIG = test_chat_data.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | HOSTKEY = $SERVICEHOME/.hostkey | 5 | HOSTKEY = $SERVICEHOME/.hostkey |
@@ -30,7 +29,6 @@ HOSTNAME = localhost | |||
30 | PORT = 42471 | 29 | PORT = 42471 |
31 | HOSTNAME = localhost | 30 | HOSTNAME = localhost |
32 | HOME = $SERVICEHOME | 31 | HOME = $SERVICEHOME |
33 | CONFIG = $DEFAULTCONFIG | ||
34 | BINARY = gnunet-service-chat | 32 | BINARY = gnunet-service-chat |
35 | 33 | ||
36 | [testing] | 34 | [testing] |
diff --git a/src/chat/test_chat_peer1.conf b/src/chat/test_chat_peer1.conf index 73280da0d..0193188de 100644 --- a/src/chat/test_chat_peer1.conf +++ b/src/chat/test_chat_peer1.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-chat-peer-1/ | 2 | SERVICEHOME = /tmp/gnunet-test-chat-peer-1/ |
3 | DEFAULTCONFIG = test_chat_peer1.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | HOSTKEY = $SERVICEHOME/.hostkey | 5 | HOSTKEY = $SERVICEHOME/.hostkey |
@@ -41,7 +40,6 @@ FRIENDS-ONLY = NO | |||
41 | AUTOCONNECT = YES | 40 | AUTOCONNECT = YES |
42 | TARGET-CONNECTION-COUNT = 16 | 41 | TARGET-CONNECTION-COUNT = 16 |
43 | FRIENDS = $SERVICEHOME/friends | 42 | FRIENDS = $SERVICEHOME/friends |
44 | CONFIG = $DEFAULTCONFIG | ||
45 | BINARY = gnunet-daemon-topology | 43 | BINARY = gnunet-daemon-topology |
46 | 44 | ||
47 | [peerinfo] | 45 | [peerinfo] |
@@ -58,7 +56,6 @@ UNIXPATH = /tmp/gnunet-chat-p1-service-statistics.sock | |||
58 | PORT = 31008 | 56 | PORT = 31008 |
59 | HOSTNAME = localhost | 57 | HOSTNAME = localhost |
60 | HOME = $SERVICEHOME | 58 | HOME = $SERVICEHOME |
61 | CONFIG = $DEFAULTCONFIG | ||
62 | BINARY = gnunet-service-chat | 59 | BINARY = gnunet-service-chat |
63 | 60 | ||
64 | [testing] | 61 | [testing] |
diff --git a/src/chat/test_chat_peer2.conf b/src/chat/test_chat_peer2.conf index 00808b5b5..c4a31a0f3 100644 --- a/src/chat/test_chat_peer2.conf +++ b/src/chat/test_chat_peer2.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-chat-peer-2/ | 2 | SERVICEHOME = /tmp/gnunet-test-chat-peer-2/ |
3 | DEFAULTCONFIG = test_chat_peer2.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | HOSTKEY = $SERVICEHOME/.hostkey | 5 | HOSTKEY = $SERVICEHOME/.hostkey |
@@ -41,7 +40,6 @@ FRIENDS-ONLY = NO | |||
41 | AUTOCONNECT = YES | 40 | AUTOCONNECT = YES |
42 | TARGET-CONNECTION-COUNT = 16 | 41 | TARGET-CONNECTION-COUNT = 16 |
43 | FRIENDS = $SERVICEHOME/friends | 42 | FRIENDS = $SERVICEHOME/friends |
44 | CONFIG = $DEFAULTCONFIG | ||
45 | BINARY = gnunet-daemon-topology | 43 | BINARY = gnunet-daemon-topology |
46 | 44 | ||
47 | [peerinfo] | 45 | [peerinfo] |
@@ -58,7 +56,6 @@ UNIXPATH = /tmp/gnunet-chat-p2-service-statistics.sock | |||
58 | PORT = 32008 | 56 | PORT = 32008 |
59 | HOSTNAME = localhost | 57 | HOSTNAME = localhost |
60 | HOME = $SERVICEHOME | 58 | HOME = $SERVICEHOME |
61 | CONFIG = $DEFAULTCONFIG | ||
62 | BINARY = gnunet-service-chat | 59 | BINARY = gnunet-service-chat |
63 | 60 | ||
64 | [testing] | 61 | [testing] |
diff --git a/src/chat/test_chat_peer3.conf b/src/chat/test_chat_peer3.conf index a39452323..d8dcedc29 100644 --- a/src/chat/test_chat_peer3.conf +++ b/src/chat/test_chat_peer3.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-chat-peer-3/ | 2 | SERVICEHOME = /tmp/gnunet-test-chat-peer-3/ |
3 | DEFAULTCONFIG = test_chat_peer3.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | HOSTKEY = $SERVICEHOME/.hostkey | 5 | HOSTKEY = $SERVICEHOME/.hostkey |
@@ -41,7 +40,6 @@ FRIENDS-ONLY = NO | |||
41 | AUTOCONNECT = YES | 40 | AUTOCONNECT = YES |
42 | TARGET-CONNECTION-COUNT = 16 | 41 | TARGET-CONNECTION-COUNT = 16 |
43 | FRIENDS = $SERVICEHOME/friends | 42 | FRIENDS = $SERVICEHOME/friends |
44 | CONFIG = $DEFAULTCONFIG | ||
45 | BINARY = gnunet-daemon-topology | 43 | BINARY = gnunet-daemon-topology |
46 | 44 | ||
47 | [peerinfo] | 45 | [peerinfo] |
@@ -58,7 +56,6 @@ UNIXPATH = /tmp/gnunet-chat-p3-service-statistics.sock | |||
58 | PORT = 33008 | 56 | PORT = 33008 |
59 | HOSTNAME = localhost | 57 | HOSTNAME = localhost |
60 | HOME = $SERVICEHOME | 58 | HOME = $SERVICEHOME |
61 | CONFIG = $DEFAULTCONFIG | ||
62 | BINARY = gnunet-service-chat | 59 | BINARY = gnunet-service-chat |
63 | 60 | ||
64 | [testing] | 61 | [testing] |
diff --git a/src/core/core.conf.in b/src/core/core.conf.in index 61ac84e6c..fbe2f7948 100644 --- a/src/core/core.conf.in +++ b/src/core/core.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = YES | |||
3 | @JAVAPORT@PORT = 2092 | 3 | @JAVAPORT@PORT = 2092 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-core | 6 | BINARY = gnunet-service-core |
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/core/test_core_api_data.conf b/src/core/test_core_api_data.conf index 30eea2dd5..440dac5c9 100644 --- a/src/core/test_core_api_data.conf +++ b/src/core/test_core_api_data.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_core_api_data.conf | ||
4 | 3 | ||
5 | [arm] | 4 | [arm] |
6 | DEFAULTSERVICES = topology hostlist | 5 | DEFAULTSERVICES = topology hostlist |
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf index 662318a44..119354c84 100644 --- a/src/core/test_core_api_peer1.conf +++ b/src/core/test_core_api_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-peer-1/ | 3 | SERVICEHOME = /tmp/test-gnunet-core-peer-1/ |
4 | DEFAULTCONFIG = test_core_api_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12468 | 6 | PORT = 12468 |
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf index cd29e3f94..e66c74c94 100644 --- a/src/core/test_core_api_peer2.conf +++ b/src/core/test_core_api_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-peer-2/ | 3 | SERVICEHOME = /tmp/test-gnunet-core-peer-2/ |
4 | DEFAULTCONFIG = test_core_api_peer2.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 22460 | 6 | PORT = 22460 |
@@ -38,4 +37,4 @@ PORT = 22467 | |||
38 | PORT = 22468 | 37 | PORT = 22468 |
39 | 38 | ||
40 | [transport-http] | 39 | [transport-http] |
41 | PORT = 22469 \ No newline at end of file | 40 | PORT = 22469 |
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf index 673772685..704a2b6da 100644 --- a/src/core/test_core_api_send_to_self.conf +++ b/src/core/test_core_api_send_to_self.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = ~/.gnunet/ | 3 | SERVICEHOME = ~/.gnunet/ |
4 | DEFAULTCONFIG = test_core_api_send_to_self.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 2425 | 6 | PORT = 2425 |
@@ -22,7 +21,6 @@ AUTOSTART = YES | |||
22 | PORT = 9252 | 21 | PORT = 9252 |
23 | HOSTNAME = localhost | 22 | HOSTNAME = localhost |
24 | HOME = $SERVICEHOME | 23 | HOME = $SERVICEHOME |
25 | CONFIG = $DEFAULTCONFIG | ||
26 | BINARY = test_core_api_send_to_self | 24 | BINARY = test_core_api_send_to_self |
27 | ACCEPT_FROM = 127.0.0.1; | 25 | ACCEPT_FROM = 127.0.0.1; |
28 | ACCEPT_FROM6 = ::1; | 26 | ACCEPT_FROM6 = ::1; |
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf index 9525ca258..25a682445 100644 --- a/src/core/test_core_defaults.conf +++ b/src/core/test_core_defaults.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-core/ | 2 | SERVICEHOME = /tmp/test-gnunet-core/ |
3 | DEFAULTCONFIG = test_core_defaults.conf | ||
4 | 3 | ||
5 | [arm] | 4 | [arm] |
6 | DEFAULTSERVICES = | 5 | DEFAULTSERVICES = |
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf index 5501fb826..dcd886280 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/ | 3 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/ |
4 | DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12488 | 6 | PORT = 12488 |
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf index 62fc69e26..13f29e91a 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/ | 3 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/ |
4 | DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer2.conf | ||
5 | 4 | ||
6 | 5 | ||
7 | [arm] | 6 | [arm] |
@@ -42,4 +41,4 @@ PORT = 22467 | |||
42 | PORT = 22468 | 41 | PORT = 22468 |
43 | 42 | ||
44 | [transport-http] | 43 | [transport-http] |
45 | PORT = 22469 \ No newline at end of file | 44 | PORT = 22469 |
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf index 568cf6b16..09c4ed049 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/ | 3 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/ |
4 | DEFAULTCONFIG = test_core_quota_asymmetric_send_limit_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12488 | 6 | PORT = 12488 |
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf index 614358ba7..03d5bce12 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/ | 3 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/ |
4 | DEFAULTCONFIG = test_core_quota_asymmetric_send_limit_peer2.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 22486 | 6 | PORT = 22486 |
@@ -41,4 +40,4 @@ PORT = 22467 | |||
41 | PORT = 22468 | 40 | PORT = 22468 |
42 | 41 | ||
43 | [transport-http] | 42 | [transport-http] |
44 | PORT = 22469 \ No newline at end of file | 43 | PORT = 22469 |
diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf index 4ff2ee44a..4a67bfe66 100644 --- a/src/core/test_core_quota_peer1.conf +++ b/src/core/test_core_quota_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-1/ | 3 | SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-1/ |
4 | DEFAULTCONFIG = test_core_quota_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12468 | 6 | PORT = 12468 |
diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf index 1fd4ec82b..e288da064 100644 --- a/src/core/test_core_quota_peer2.conf +++ b/src/core/test_core_quota_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_core_defaults.conf | 1 | @INLINE@ test_core_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-2/ | 3 | SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-2/ |
4 | DEFAULTCONFIG = test_core_quota_peer2.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 22476 | 6 | PORT = 22476 |
@@ -41,4 +40,4 @@ PORT = 22467 | |||
41 | PORT = 22468 | 40 | PORT = 22468 |
42 | 41 | ||
43 | [transport-http] | 42 | [transport-http] |
44 | PORT = 22469 \ No newline at end of file | 43 | PORT = 22469 |
diff --git a/src/datastore/datastore.conf.in b/src/datastore/datastore.conf.in index 8cdb7b739..4149417de 100644 --- a/src/datastore/datastore.conf.in +++ b/src/datastore/datastore.conf.in | |||
@@ -6,7 +6,6 @@ UNIX_MATCH_GID = YES | |||
6 | @UNIXONLY@ PORT = 2093 | 6 | @UNIXONLY@ PORT = 2093 |
7 | HOSTNAME = localhost | 7 | HOSTNAME = localhost |
8 | HOME = $SERVICEHOME | 8 | HOME = $SERVICEHOME |
9 | CONFIG = $DEFAULTCONFIG | ||
10 | BINARY = gnunet-service-datastore | 9 | BINARY = gnunet-service-datastore |
11 | ACCEPT_FROM = 127.0.0.1; | 10 | ACCEPT_FROM = 127.0.0.1; |
12 | ACCEPT_FROM6 = ::1; | 11 | ACCEPT_FROM6 = ::1; |
diff --git a/src/datastore/perf_plugin_datastore_data_mysql.conf b/src/datastore/perf_plugin_datastore_data_mysql.conf index dd26512e9..006b146af 100644 --- a/src/datastore/perf_plugin_datastore_data_mysql.conf +++ b/src/datastore/perf_plugin_datastore_data_mysql.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/perf-gnunet-datastore-mysql/ | 3 | SERVICEHOME = /tmp/perf-gnunet-datastore-mysql/ |
4 | DEFAULTCONFIG = perf_plugin_datastore_data_mysql.conf | ||
5 | 4 | ||
6 | [datastore] | 5 | [datastore] |
7 | DATABASE = mysql | 6 | DATABASE = mysql |
diff --git a/src/datastore/perf_plugin_datastore_data_postgres.conf b/src/datastore/perf_plugin_datastore_data_postgres.conf index 53ce6cfc9..052fa486e 100644 --- a/src/datastore/perf_plugin_datastore_data_postgres.conf +++ b/src/datastore/perf_plugin_datastore_data_postgres.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/perf-gnunet-datastore-postgres/ | 3 | SERVICEHOME = /tmp/perf-gnunet-datastore-postgres/ |
4 | DEFAULTCONFIG = perf_plugin_datastore_data_postgres.conf | ||
5 | 4 | ||
6 | [datastore] | 5 | [datastore] |
7 | DATABASE = postgres | 6 | DATABASE = postgres |
diff --git a/src/datastore/perf_plugin_datastore_data_sqlite.conf b/src/datastore/perf_plugin_datastore_data_sqlite.conf index 241d85efc..5f97597d6 100644 --- a/src/datastore/perf_plugin_datastore_data_sqlite.conf +++ b/src/datastore/perf_plugin_datastore_data_sqlite.conf | |||
@@ -1,5 +1,4 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/perf-gnunet-datastore-sqlite/ | 3 | SERVICEHOME = /tmp/perf-gnunet-datastore-sqlite/ |
4 | DEFAULTCONFIG = perf_plugin_datastore_data_sqlite.conf | ||
5 | 4 | ||
diff --git a/src/datastore/test_datastore_api_data_mysql.conf b/src/datastore/test_datastore_api_data_mysql.conf index 8e5a3dc0d..92967b976 100644 --- a/src/datastore/test_datastore_api_data_mysql.conf +++ b/src/datastore/test_datastore_api_data_mysql.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-mysql/ | 3 | SERVICEHOME = /tmp/test-gnunet-datastore-mysql/ |
4 | DEFAULTCONFIG = test_datastore_api_data_mysql.conf | ||
5 | 4 | ||
6 | [TESTING] | 5 | [TESTING] |
7 | WEAKRANDOM = YES | 6 | WEAKRANDOM = YES |
diff --git a/src/datastore/test_datastore_api_data_postgres.conf b/src/datastore/test_datastore_api_data_postgres.conf index 046c561f4..a1a21689b 100644 --- a/src/datastore/test_datastore_api_data_postgres.conf +++ b/src/datastore/test_datastore_api_data_postgres.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-postgres/ | 3 | SERVICEHOME = /tmp/test-gnunet-datastore-postgres/ |
4 | DEFAULTCONFIG = test_datastore_api_data_postgres.conf | ||
5 | 4 | ||
6 | [TESTING] | 5 | [TESTING] |
7 | WEAKRANDOM = YES | 6 | WEAKRANDOM = YES |
diff --git a/src/datastore/test_datastore_api_data_sqlite.conf b/src/datastore/test_datastore_api_data_sqlite.conf index a743b8008..953aef248 100644 --- a/src/datastore/test_datastore_api_data_sqlite.conf +++ b/src/datastore/test_datastore_api_data_sqlite.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/ | 3 | SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/ |
4 | DEFAULTCONFIG = test_datastore_api_data_sqlite.conf | ||
5 | 4 | ||
6 | [TESTING] | 5 | [TESTING] |
7 | WEAKRANDOM = YES | 6 | WEAKRANDOM = YES |
diff --git a/src/datastore/test_plugin_datastore_data_mysql.conf b/src/datastore/test_plugin_datastore_data_mysql.conf index 957818ad8..845454b12 100644 --- a/src/datastore/test_plugin_datastore_data_mysql.conf +++ b/src/datastore/test_plugin_datastore_data_mysql.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-plugin-mysql/ | 3 | SERVICEHOME = /tmp/test-gnunet-datastore-plugin-mysql/ |
4 | DEFAULTCONFIG = test_plugin_datastore_data_mysql.conf | ||
5 | 4 | ||
6 | [datastore] | 5 | [datastore] |
7 | DATABASE = mysql | 6 | DATABASE = mysql |
diff --git a/src/datastore/test_plugin_datastore_data_postgres.conf b/src/datastore/test_plugin_datastore_data_postgres.conf index d79649663..8b8523d40 100644 --- a/src/datastore/test_plugin_datastore_data_postgres.conf +++ b/src/datastore/test_plugin_datastore_data_postgres.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-plugin-postgres/ | 3 | SERVICEHOME = /tmp/test-gnunet-datastore-plugin-postgres/ |
4 | DEFAULTCONFIG = test_plugin_datastore_data_postgres.conf | ||
5 | 4 | ||
6 | [datastore] | 5 | [datastore] |
7 | DATABASE = postgres | 6 | DATABASE = postgres |
diff --git a/src/datastore/test_plugin_datastore_data_sqlite.conf b/src/datastore/test_plugin_datastore_data_sqlite.conf index f1fcf5f7f..dcdea7dde 100644 --- a/src/datastore/test_plugin_datastore_data_sqlite.conf +++ b/src/datastore/test_plugin_datastore_data_sqlite.conf | |||
@@ -1,5 +1,4 @@ | |||
1 | @INLINE@ test_defaults.conf | 1 | @INLINE@ test_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-datastore-plugin-sqlite/ | 3 | SERVICEHOME = /tmp/test-gnunet-datastore-plugin-sqlite/ |
4 | DEFAULTCONFIG = test_plugin_datastore_data_sqlite.conf | ||
5 | 4 | ||
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] |
diff --git a/src/dns/dns.conf.in b/src/dns/dns.conf.in index d2c67958a..65cb392e2 100644 --- a/src/dns/dns.conf.in +++ b/src/dns/dns.conf.in | |||
@@ -2,7 +2,6 @@ | |||
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | HOSTNAME = localhost | 3 | HOSTNAME = localhost |
4 | HOME = $SERVICEHOME | 4 | HOME = $SERVICEHOME |
5 | CONFIG = $DEFAULTCONFIG | ||
6 | BINARY = gnunet-service-dns | 5 | BINARY = gnunet-service-dns |
7 | UNIXPATH = /tmp/gnunet-service-dns.sock | 6 | UNIXPATH = /tmp/gnunet-service-dns.sock |
8 | 7 | ||
diff --git a/src/dv/dv.conf.in b/src/dv/dv.conf.in index 93278df7c..158bbcdd6 100644 --- a/src/dv/dv.conf.in +++ b/src/dv/dv.conf.in | |||
@@ -4,7 +4,6 @@ DEBUG = NO | |||
4 | ACCEPT_FROM6 = ::1; | 4 | ACCEPT_FROM6 = ::1; |
5 | ACCEPT_FROM = 127.0.0.1; | 5 | ACCEPT_FROM = 127.0.0.1; |
6 | BINARY = gnunet-service-dv | 6 | BINARY = gnunet-service-dv |
7 | CONFIG = $DEFAULTCONFIG | ||
8 | HOME = $SERVICEHOME | 7 | HOME = $SERVICEHOME |
9 | HOSTNAME = localhost | 8 | HOSTNAME = localhost |
10 | @UNIXONLY@ PORT = 2571 | 9 | @UNIXONLY@ PORT = 2571 |
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf index 1078c369f..3daa6a7f4 100644 --- a/src/dv/test_transport_dv_data.conf +++ b/src/dv/test_transport_dv_data.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-dv-testing/ | 2 | SERVICEHOME = /tmp/test-gnunet-dv-testing/ |
3 | DEFAULTCONFIG = test_transport_dv_data.conf | ||
4 | 3 | ||
5 | [resolver] | 4 | [resolver] |
6 | PORT = 2564 | 5 | PORT = 2564 |
@@ -39,7 +38,6 @@ DEBUG = NO | |||
39 | ACCEPT_FROM6 = ::1; | 38 | ACCEPT_FROM6 = ::1; |
40 | ACCEPT_FROM = 127.0.0.1; | 39 | ACCEPT_FROM = 127.0.0.1; |
41 | BINARY = gnunet-service-dv | 40 | BINARY = gnunet-service-dv |
42 | CONFIG = $DEFAULTCONFIG | ||
43 | HOME = $SERVICEHOME | 41 | HOME = $SERVICEHOME |
44 | HOSTNAME = localhost | 42 | HOSTNAME = localhost |
45 | PORT = 2571 | 43 | PORT = 2571 |
diff --git a/src/exit/exit.conf b/src/exit/exit.conf index 0d48de94b..d0a4b35f3 100644 --- a/src/exit/exit.conf +++ b/src/exit/exit.conf | |||
@@ -1,5 +1,4 @@ | |||
1 | [exit] | 1 | [exit] |
2 | CONFIG = $DEFAULTCONFIG | ||
3 | BINARY = gnunet-daemon-exit | 2 | BINARY = gnunet-daemon-exit |
4 | 3 | ||
5 | # IPv6 address for the TUN interface (must be changed as this | 4 | # IPv6 address for the TUN interface (must be changed as this |
diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in index 6c4d8217d..cac59e5cb 100644 --- a/src/fs/fs.conf.in +++ b/src/fs/fs.conf.in | |||
@@ -8,7 +8,6 @@ UPDATE_DIR = $SERVICEHOME/fs/updates/ | |||
8 | @UNIXONLY@ PORT = 2094 | 8 | @UNIXONLY@ PORT = 2094 |
9 | HOSTNAME = localhost | 9 | HOSTNAME = localhost |
10 | HOME = $SERVICEHOME | 10 | HOME = $SERVICEHOME |
11 | CONFIG = $DEFAULTCONFIG | ||
12 | BINARY = gnunet-service-fs | 11 | BINARY = gnunet-service-fs |
13 | ACCEPT_FROM = 127.0.0.1; | 12 | ACCEPT_FROM = 127.0.0.1; |
14 | ACCEPT_FROM6 = ::1; | 13 | ACCEPT_FROM6 = ::1; |
@@ -34,7 +33,6 @@ PREFIX = @MONKEYPREFIX@ | |||
34 | 33 | ||
35 | [gnunet-auto-share] | 34 | [gnunet-auto-share] |
36 | BINARY = gnunet-auto-share | 35 | BINARY = gnunet-auto-share |
37 | CONFIG = $DEFAULTCONFIG | ||
38 | 36 | ||
39 | # Note: MUST specify path to auto-share directory and CAN specify other options | 37 | # Note: MUST specify path to auto-share directory and CAN specify other options |
40 | # to gnunet-auto-share here! | 38 | # to gnunet-auto-share here! |
diff --git a/src/fs/test_fs_data.conf b/src/fs/test_fs_data.conf index f2b4e1ee7..40e85ad4c 100644 --- a/src/fs/test_fs_data.conf +++ b/src/fs/test_fs_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-data/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-data/ |
4 | DEFAULTCONFIG = test_fs_data.conf | ||
5 | 4 | ||
6 | [fs] | 5 | [fs] |
7 | ACTIVEMIGRATION = NO | 6 | ACTIVEMIGRATION = NO |
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf index e0e697ec7..d1c4d8292 100644 --- a/src/fs/test_fs_defaults.conf +++ b/src/fs/test_fs_defaults.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-lib/ | 2 | SERVICEHOME = /tmp/gnunet-test-fs-lib/ |
3 | DEFAULTCONFIG = fs_test_lib_data.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | HOSTKEY = $SERVICEHOME/.hostkey | 5 | HOSTKEY = $SERVICEHOME/.hostkey |
diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf index 25aad5119..7955daa4d 100644 --- a/src/fs/test_fs_download_data.conf +++ b/src/fs/test_fs_download_data.conf | |||
@@ -1,5 +1,4 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-download/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-download/ |
4 | DEFAULTCONFIG = test_fs_download_data.conf | ||
5 | 4 | ||
diff --git a/src/fs/test_fs_file_information_data.conf b/src/fs/test_fs_file_information_data.conf index 09cedf899..ea43807b1 100644 --- a/src/fs/test_fs_file_information_data.conf +++ b/src/fs/test_fs_file_information_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-file-information/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-file-information/ |
4 | DEFAULTCONFIG = test_fs_file_information_data.conf | ||
5 | 4 | ||
6 | [transport] | 5 | [transport] |
7 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/fs/test_fs_list_indexed_data.conf index 704ba4d66..99d446680 100644 --- a/src/fs/test_fs_list_indexed_data.conf +++ b/src/fs/test_fs_list_indexed_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/ |
4 | DEFAULTCONFIG = test_fs_list_indexed_data.conf | ||
5 | 4 | ||
6 | [transport] | 5 | [transport] |
7 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_fs_namespace_data.conf b/src/fs/test_fs_namespace_data.conf index 3cdd241d7..625eb2d51 100644 --- a/src/fs/test_fs_namespace_data.conf +++ b/src/fs/test_fs_namespace_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-namespace/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-namespace/ |
4 | DEFAULTCONFIG = test_fs_namespace_data.conf | ||
5 | 4 | ||
6 | [transport] | 5 | [transport] |
7 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_fs_publish_data.conf b/src/fs/test_fs_publish_data.conf index 234f2b0ef..14e69197b 100644 --- a/src/fs/test_fs_publish_data.conf +++ b/src/fs/test_fs_publish_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-publish/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-publish/ |
4 | DEFAULTCONFIG = test_fs_publish_data.conf | ||
5 | 4 | ||
6 | [transport] | 5 | [transport] |
7 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_fs_search_data.conf b/src/fs/test_fs_search_data.conf index ea5e4c5e3..812a7bfe2 100644 --- a/src/fs/test_fs_search_data.conf +++ b/src/fs/test_fs_search_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-search/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-search/ |
4 | DEFAULTCONFIG = test_fs_search_data.conf | ||
5 | 4 | ||
6 | [transport] | 5 | [transport] |
7 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_fs_unindex_data.conf b/src/fs/test_fs_unindex_data.conf index 977d6e759..fa28fbbbd 100644 --- a/src/fs/test_fs_unindex_data.conf +++ b/src/fs/test_fs_unindex_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-unindex/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-unindex/ |
4 | DEFAULTCONFIG = test_fs_unindex_data.conf | ||
5 | 4 | ||
6 | [transport] | 5 | [transport] |
7 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_gnunet_fs_idx_data.conf b/src/fs/test_gnunet_fs_idx_data.conf index f852011a8..4394805e5 100644 --- a/src/fs/test_gnunet_fs_idx_data.conf +++ b/src/fs/test_gnunet_fs_idx_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-py-idx/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-py-idx/ |
4 | DEFAULTCONFIG = test_gnunet_fs_idx_data.conf | ||
5 | 4 | ||
6 | [transport] | 5 | [transport] |
7 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_gnunet_fs_ns_data.conf b/src/fs/test_gnunet_fs_ns_data.conf index 5f297abfa..57e3432e1 100644 --- a/src/fs/test_gnunet_fs_ns_data.conf +++ b/src/fs/test_gnunet_fs_ns_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-py-ns/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-py-ns/ |
4 | DEFAULTCONFIG = test_gnunet_fs_ns_data.conf | ||
5 | 4 | ||
6 | [transport] | 5 | [transport] |
7 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_gnunet_fs_psd_data.conf b/src/fs/test_gnunet_fs_psd_data.conf index b68c6b58e..e41f6bfe3 100644 --- a/src/fs/test_gnunet_fs_psd_data.conf +++ b/src/fs/test_gnunet_fs_psd_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-py-psd/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-py-psd/ |
4 | DEFAULTCONFIG = test_gnunet_fs_psd_data.conf | ||
5 | 4 | ||
6 | [transport] | 5 | [transport] |
7 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_gnunet_fs_rec_data.conf b/src/fs/test_gnunet_fs_rec_data.conf index dae8b19a8..fcdcda96d 100644 --- a/src/fs/test_gnunet_fs_rec_data.conf +++ b/src/fs/test_gnunet_fs_rec_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/gnunet-test-fs-py-rec/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-py-rec/ |
4 | DEFAULTCONFIG = test_gnunet_fs_rec_data.conf | ||
5 | 4 | ||
6 | [transport] | 5 | [transport] |
7 | PLUGINS = | 6 | PLUGINS = |
diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf b/src/fs/test_gnunet_service_fs_migration_data.conf index 9c05a88e9..cd14c3261 100644 --- a/src/fs/test_gnunet_service_fs_migration_data.conf +++ b/src/fs/test_gnunet_service_fs_migration_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | 1 | @INLINE@ test_fs_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-service-fs-migration/ | 3 | SERVICEHOME = /tmp/test-gnunet-service-fs-migration/ |
4 | DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf | ||
5 | 4 | ||
6 | 5 | ||
7 | [ats] | 6 | [ats] |
diff --git a/src/gns/gns-helper-service-w32.conf b/src/gns/gns-helper-service-w32.conf index 2d01c8f9d..48652173a 100644 --- a/src/gns/gns-helper-service-w32.conf +++ b/src/gns/gns-helper-service-w32.conf | |||
@@ -1,5 +1,4 @@ | |||
1 | [gns-helper-service-w32] | 1 | [gns-helper-service-w32] |
2 | CONFIG = $DEFAULTCONFIG | ||
3 | AUTOSTART = YES | 2 | AUTOSTART = YES |
4 | BINARY = gnunet-gns-helper-service-w32 | 3 | BINARY = gnunet-gns-helper-service-w32 |
5 | PORT = 5353 | 4 | PORT = 5353 |
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in index 91c0a4dc2..303fbf90b 100644 --- a/src/gns/gns.conf.in +++ b/src/gns/gns.conf.in | |||
@@ -2,7 +2,6 @@ | |||
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | HOSTNAME = localhost | 3 | HOSTNAME = localhost |
4 | HOME = $SERVICEHOME | 4 | HOME = $SERVICEHOME |
5 | CONFIG = $DEFAULTCONFIG | ||
6 | BINARY = gnunet-service-gns | 5 | BINARY = gnunet-service-gns |
7 | UNIXPATH = /tmp/gnunet-service-gns.sock | 6 | UNIXPATH = /tmp/gnunet-service-gns.sock |
8 | @UNIXONLY@PORT = 2102 | 7 | @UNIXONLY@PORT = 2102 |
@@ -26,6 +25,5 @@ HTTPPORT = 18080 | |||
26 | ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey | 25 | ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey |
27 | HOSTNAME = localhost | 26 | HOSTNAME = localhost |
28 | HOME = $SERVICEHOME | 27 | HOME = $SERVICEHOME |
29 | CONFIG = $DEFAULTCONFIG | ||
30 | BINARY = gnunet-gns-fcfsd | 28 | BINARY = gnunet-gns-fcfsd |
31 | 29 | ||
diff --git a/src/gns/test_gns_dht_default.conf b/src/gns/test_gns_dht_default.conf index b2897509a..cca3b4338 100644 --- a/src/gns/test_gns_dht_default.conf +++ b/src/gns/test_gns_dht_default.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_gns_defaults.conf | 1 | @INLINE@ test_gns_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-gns-dht/ | 3 | SERVICEHOME = /tmp/test-gnunet-gns-dht/ |
4 | DEFAULTCONFIG = test_gns_dht_default.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 22568 | 6 | PORT = 22568 |
@@ -67,7 +66,6 @@ ZONEKEY = $SERVICEHOME/.hostkey | |||
67 | HIJACK_DNS = NO | 66 | HIJACK_DNS = NO |
68 | UNIXPATH = /tmp/gnunet-service-gns-default.sock | 67 | UNIXPATH = /tmp/gnunet-service-gns-default.sock |
69 | HOME = $SERVICEHOME | 68 | HOME = $SERVICEHOME |
70 | CONFIG = $DEFAULTCONFIG | ||
71 | AUTO_IMPORT_PKEY = NO | 69 | AUTO_IMPORT_PKEY = NO |
72 | MAX_PARALLEL_BACKGROUND_QUERIES = 10 | 70 | MAX_PARALLEL_BACKGROUND_QUERIES = 10 |
73 | DEFAULT_LOOKUP_TIMEOUT = 10 | 71 | DEFAULT_LOOKUP_TIMEOUT = 10 |
@@ -81,7 +79,6 @@ UNIX_MATCH_UID = YES | |||
81 | UNIX_MATCH_GID = YES | 79 | UNIX_MATCH_GID = YES |
82 | HOSTNAME = localhost | 80 | HOSTNAME = localhost |
83 | HOME = $SERVICEHOME | 81 | HOME = $SERVICEHOME |
84 | CONFIG = $DEFAULTCONFIG | ||
85 | BINARY = gnunet-service-namestore | 82 | BINARY = gnunet-service-namestore |
86 | ACCEPT_FROM = 127.0.0.1; | 83 | ACCEPT_FROM = 127.0.0.1; |
87 | ACCEPT_FROM6 = ::1; | 84 | ACCEPT_FROM6 = ::1; |
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf index 81ec9a713..b098edb60 100644 --- a/src/gns/test_gns_proxy.conf +++ b/src/gns/test_gns_proxy.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-gns-proxy/ | 2 | SERVICEHOME = /tmp/gnunet-test-gns-proxy/ |
3 | DEFAULTCONFIG = test_gns_proxy.conf | ||
4 | 3 | ||
5 | [transport] | 4 | [transport] |
6 | PLUGINS = tcp | 5 | PLUGINS = tcp |
@@ -16,7 +15,7 @@ HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat | |||
16 | 15 | ||
17 | [gns] | 16 | [gns] |
18 | AUTOSTART = YES | 17 | AUTOSTART = YES |
19 | ZONEKEY = $SERVICEHOME/hostkey | 18 | ZONEKEY = $SERVICEHOME/.hostkey |
20 | HIJACK_DNS = YES | 19 | HIJACK_DNS = YES |
21 | 20 | ||
22 | [gns-proxy] | 21 | [gns-proxy] |
@@ -29,4 +28,4 @@ AUTOSTART = YES | |||
29 | [dns] | 28 | [dns] |
30 | PROVIDE_EXIT = NO | 29 | PROVIDE_EXIT = NO |
31 | #DNS_EXIT = 8.8.8.8 | 30 | #DNS_EXIT = 8.8.8.8 |
32 | #PREFIX = valgrind --leak-check=full \ No newline at end of file | 31 | #PREFIX = valgrind --leak-check=full |
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf index dcd47da96..8143eddca 100644 --- a/src/gns/test_gns_simple_lookup.conf +++ b/src/gns/test_gns_simple_lookup.conf | |||
@@ -54,7 +54,6 @@ WEAKRANDOM = YES | |||
54 | HOSTKEY = zonefiles/test_zonekey | 54 | HOSTKEY = zonefiles/test_zonekey |
55 | 55 | ||
56 | [PATHS] | 56 | [PATHS] |
57 | DEFAULTCONFIG = test_gns_simple_lookup.conf | ||
58 | SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/ | 57 | SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/ |
59 | 58 | ||
60 | 59 | ||
@@ -84,7 +83,6 @@ SHORTEN_ZONEKEY = zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0 | |||
84 | HIJACK_DNS = NO | 83 | HIJACK_DNS = NO |
85 | UNIXPATH = /tmp/gnunet-service-gns.sock | 84 | UNIXPATH = /tmp/gnunet-service-gns.sock |
86 | HOME = $SERVICEHOME | 85 | HOME = $SERVICEHOME |
87 | CONFIG = $DEFAULTCONFIG | ||
88 | AUTO_IMPORT_PKEY = YES | 86 | AUTO_IMPORT_PKEY = YES |
89 | MAX_PARALLEL_BACKGROUND_QUERIES = 10 | 87 | MAX_PARALLEL_BACKGROUND_QUERIES = 10 |
90 | DEFAULT_LOOKUP_TIMEOUT = 15 | 88 | DEFAULT_LOOKUP_TIMEOUT = 15 |
@@ -104,7 +102,6 @@ UNIX_MATCH_UID = YES | |||
104 | UNIX_MATCH_GID = YES | 102 | UNIX_MATCH_GID = YES |
105 | HOSTNAME = localhost | 103 | HOSTNAME = localhost |
106 | HOME = $SERVICEHOME | 104 | HOME = $SERVICEHOME |
107 | CONFIG = $DEFAULTCONFIG | ||
108 | BINARY = gnunet-service-namestore | 105 | BINARY = gnunet-service-namestore |
109 | ACCEPT_FROM = 127.0.0.1; | 106 | ACCEPT_FROM = 127.0.0.1; |
110 | ACCEPT_FROM6 = ::1; | 107 | ACCEPT_FROM6 = ::1; |
diff --git a/src/hostlist/hostlist.conf b/src/hostlist/hostlist.conf index f7c1be39d..8c3675fd8 100644 --- a/src/hostlist/hostlist.conf +++ b/src/hostlist/hostlist.conf | |||
@@ -3,7 +3,6 @@ | |||
3 | HTTPPORT = 8080 | 3 | HTTPPORT = 8080 |
4 | HOME = $SERVICEHOME | 4 | HOME = $SERVICEHOME |
5 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 5 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-daemon-hostlist | 6 | BINARY = gnunet-daemon-hostlist |
8 | # consider having "-e" as default as well once implemented | 7 | # consider having "-e" as default as well once implemented |
9 | OPTIONS = -b | 8 | OPTIONS = -b |
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf index 78dde578e..c880190a1 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_hostlist_defaults.conf | 1 | @INLINE@ test_hostlist_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ | 3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ |
4 | DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12968 | 6 | PORT = 12968 |
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf index 41862daf3..c3833381a 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_hostlist_defaults.conf | 1 | @INLINE@ test_hostlist_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ | 3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ |
4 | DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 22968 | 6 | PORT = 22968 |
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf index c2d0a70d2..c7ef8ea0f 100644 --- a/src/hostlist/test_hostlist_defaults.conf +++ b/src/hostlist/test_hostlist_defaults.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-hostlist/ | 2 | SERVICEHOME = /tmp/test-gnunet-hostlist/ |
3 | DEFAULTCONFIG = test_hostlist_default.conf | ||
4 | 3 | ||
5 | [resolver] | 4 | [resolver] |
6 | PORT = 12464 | 5 | PORT = 12464 |
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf index fe50bd519..b08660a33 100644 --- a/src/hostlist/test_learning_adv_peer.conf +++ b/src/hostlist/test_learning_adv_peer.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_hostlist_defaults.conf | 1 | @INLINE@ test_hostlist_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ | 3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ |
4 | DEFAULTCONFIG = test_learning_adv_peer.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 22968 | 6 | PORT = 22968 |
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf index 0136d7706..95de70530 100644 --- a/src/hostlist/test_learning_learn_peer.conf +++ b/src/hostlist/test_learning_learn_peer.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_hostlist_defaults.conf | 1 | @INLINE@ test_hostlist_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ | 3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ |
4 | DEFAULTCONFIG = test_learning_learn_peer.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12968 | 6 | PORT = 12968 |
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf index 4fd54bbc9..f70fbda5f 100644 --- a/src/hostlist/test_learning_learn_peer2.conf +++ b/src/hostlist/test_learning_learn_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_hostlist_defaults.conf | 1 | @INLINE@ test_hostlist_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/ | 3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/ |
4 | DEFAULTCONFIG = test_learning_learn_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 32968 | 6 | PORT = 32968 |
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf index e96c31cf4..70c50ec53 100644 --- a/src/integration-tests/confs/c_bootstrap_server.conf +++ b/src/integration-tests/confs/c_bootstrap_server.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_bootstrap_server/ | 2 | SERVICEHOME = /tmp/c_bootstrap_server/ |
3 | DEFAULTCONFIG = confs/c_bootstrap_server.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -11,7 +10,6 @@ AUTOSTART = YES | |||
11 | PORT = 0 | 10 | PORT = 0 |
12 | HOSTNAME = localhost | 11 | HOSTNAME = localhost |
13 | HOME = $SERVICEHOME | 12 | HOME = $SERVICEHOME |
14 | CONFIG = $DEFAULTCONFIG | ||
15 | BINARY = gnunet-service-dns | 13 | BINARY = gnunet-service-dns |
16 | ACCEPT_FROM = 127.0.0.1; | 14 | ACCEPT_FROM = 127.0.0.1; |
17 | ACCEPT_FROM6 = ::1; | 15 | ACCEPT_FROM6 = ::1; |
@@ -22,7 +20,6 @@ AUTOSTART = YES | |||
22 | PORT = 20017 | 20 | PORT = 20017 |
23 | HOSTNAME = localhost | 21 | HOSTNAME = localhost |
24 | HOME = $SERVICEHOME | 22 | HOME = $SERVICEHOME |
25 | CONFIG = $DEFAULTCONFIG | ||
26 | BINARY = gnunet-service-resolver | 23 | BINARY = gnunet-service-resolver |
27 | ACCEPT_FROM = 127.0.0.1; | 24 | ACCEPT_FROM = 127.0.0.1; |
28 | ACCEPT_FROM6 = ::1; | 25 | ACCEPT_FROM6 = ::1; |
@@ -35,7 +32,6 @@ AUTOSTART = YES | |||
35 | PORT = 20016 | 32 | PORT = 20016 |
36 | HOSTNAME = localhost | 33 | HOSTNAME = localhost |
37 | HOME = $SERVICEHOME | 34 | HOME = $SERVICEHOME |
38 | CONFIG = $DEFAULTCONFIG | ||
39 | BINARY = gnunet-service-mesh | 35 | BINARY = gnunet-service-mesh |
40 | ACCEPT_FROM = 127.0.0.1; | 36 | ACCEPT_FROM = 127.0.0.1; |
41 | ACCEPT_FROM6 = ::1; | 37 | ACCEPT_FROM6 = ::1; |
@@ -48,7 +44,6 @@ AUTOSTART = YES | |||
48 | PORT = 20015 | 44 | PORT = 20015 |
49 | HOSTNAME = localhost | 45 | HOSTNAME = localhost |
50 | HOME = $SERVICEHOME | 46 | HOME = $SERVICEHOME |
51 | CONFIG = $DEFAULTCONFIG | ||
52 | BINARY = gnunet-service-nse | 47 | BINARY = gnunet-service-nse |
53 | ACCEPT_FROM = 127.0.0.1; | 48 | ACCEPT_FROM = 127.0.0.1; |
54 | ACCEPT_FROM6 = ::1; | 49 | ACCEPT_FROM6 = ::1; |
@@ -67,7 +62,6 @@ FRIENDS-ONLY = NO | |||
67 | AUTOCONNECT = YES | 62 | AUTOCONNECT = YES |
68 | TARGET-CONNECTION-COUNT = 16 | 63 | TARGET-CONNECTION-COUNT = 16 |
69 | FRIENDS = $SERVICEHOME/friends | 64 | FRIENDS = $SERVICEHOME/friends |
70 | CONFIG = $DEFAULTCONFIG | ||
71 | BINARY = gnunet-daemon-topology | 65 | BINARY = gnunet-daemon-topology |
72 | 66 | ||
73 | [datastore] | 67 | [datastore] |
@@ -78,7 +72,6 @@ UNIX_MATCH_GID = YES | |||
78 | PORT = 20014 | 72 | PORT = 20014 |
79 | HOSTNAME = localhost | 73 | HOSTNAME = localhost |
80 | HOME = $SERVICEHOME | 74 | HOME = $SERVICEHOME |
81 | CONFIG = $DEFAULTCONFIG | ||
82 | BINARY = gnunet-service-datastore | 75 | BINARY = gnunet-service-datastore |
83 | ACCEPT_FROM = 127.0.0.1; | 76 | ACCEPT_FROM = 127.0.0.1; |
84 | ACCEPT_FROM6 = ::1; | 77 | ACCEPT_FROM6 = ::1; |
@@ -101,7 +94,6 @@ AUTOSTART = YES | |||
101 | PORT = 20013 | 94 | PORT = 20013 |
102 | HOSTNAME = localhost | 95 | HOSTNAME = localhost |
103 | HOME = $SERVICEHOME | 96 | HOME = $SERVICEHOME |
104 | CONFIG = $DEFAULTCONFIG | ||
105 | BINARY = gnunet-service-peerinfo | 97 | BINARY = gnunet-service-peerinfo |
106 | ACCEPT_FROM = 127.0.0.1; | 98 | ACCEPT_FROM = 127.0.0.1; |
107 | ACCEPT_FROM6 = ::1; | 99 | ACCEPT_FROM6 = ::1; |
@@ -125,7 +117,6 @@ AUTOSTART = YES | |||
125 | PORT = 20012 | 117 | PORT = 20012 |
126 | HOSTNAME = localhost | 118 | HOSTNAME = localhost |
127 | HOME = $SERVICEHOME | 119 | HOME = $SERVICEHOME |
128 | CONFIG = $DEFAULTCONFIG | ||
129 | BINARY = gnunet-service-ats | 120 | BINARY = gnunet-service-ats |
130 | ACCEPT_FROM = 127.0.0.1; | 121 | ACCEPT_FROM = 127.0.0.1; |
131 | ACCEPT_FROM6 = ::1; | 122 | ACCEPT_FROM6 = ::1; |
@@ -147,7 +138,6 @@ AUTOSTART = YES | |||
147 | PORT = 20011 | 138 | PORT = 20011 |
148 | HOSTNAME = localhost | 139 | HOSTNAME = localhost |
149 | HOME = $SERVICEHOME | 140 | HOME = $SERVICEHOME |
150 | CONFIG = $DEFAULTCONFIG | ||
151 | BINARY = gnunet-service-transport | 141 | BINARY = gnunet-service-transport |
152 | NEIGHBOUR_LIMIT = 50 | 142 | NEIGHBOUR_LIMIT = 50 |
153 | ACCEPT_FROM = 127.0.0.1; | 143 | ACCEPT_FROM = 127.0.0.1; |
@@ -199,7 +189,6 @@ AUTOSTART = NO | |||
199 | PORT = 20006 | 189 | PORT = 20006 |
200 | HOSTNAME = localhost | 190 | HOSTNAME = localhost |
201 | HOME = $SERVICEHOME | 191 | HOME = $SERVICEHOME |
202 | CONFIG = $DEFAULTCONFIG | ||
203 | BINARY = gnunet-service-template | 192 | BINARY = gnunet-service-template |
204 | ACCEPT_FROM = 127.0.0.1; | 193 | ACCEPT_FROM = 127.0.0.1; |
205 | ACCEPT_FROM6 = ::1; | 194 | ACCEPT_FROM6 = ::1; |
@@ -217,7 +206,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
217 | PORT = 20005 | 206 | PORT = 20005 |
218 | HOSTNAME = localhost | 207 | HOSTNAME = localhost |
219 | HOME = $SERVICEHOME | 208 | HOME = $SERVICEHOME |
220 | CONFIG = $DEFAULTCONFIG | ||
221 | BINARY = gnunet-service-fs | 209 | BINARY = gnunet-service-fs |
222 | ACCEPT_FROM = 127.0.0.1; | 210 | ACCEPT_FROM = 127.0.0.1; |
223 | ACCEPT_FROM6 = ::1; | 211 | ACCEPT_FROM6 = ::1; |
@@ -232,7 +220,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
232 | EXPECTED_NEIGHBOUR_COUNT = 128 | 220 | EXPECTED_NEIGHBOUR_COUNT = 128 |
233 | 221 | ||
234 | [vpn] | 222 | [vpn] |
235 | CONFIG = $DEFAULTCONFIG | ||
236 | BINARY = gnunet-daemon-vpn | 223 | BINARY = gnunet-daemon-vpn |
237 | IPV6ADDR = 1234::1 | 224 | IPV6ADDR = 1234::1 |
238 | IPV6PREFIX = 32 | 225 | IPV6PREFIX = 32 |
@@ -243,7 +230,6 @@ VIRTDNS6 = 1234::17 | |||
243 | IFNAME = vpn-gnunet | 230 | IFNAME = vpn-gnunet |
244 | 231 | ||
245 | [exit] | 232 | [exit] |
246 | CONFIG = $DEFAULTCONFIG | ||
247 | BINARY = gnunet-daemon-exit | 233 | BINARY = gnunet-daemon-exit |
248 | IPV6ADDR = 1234:1::1 | 234 | IPV6ADDR = 1234:1::1 |
249 | IPV6PREFIX = 32 | 235 | IPV6PREFIX = 32 |
@@ -258,7 +244,6 @@ AUTOSTART = YES | |||
258 | PORT = 0 | 244 | PORT = 0 |
259 | HOSTNAME = localhost | 245 | HOSTNAME = localhost |
260 | HOME = $SERVICEHOME | 246 | HOME = $SERVICEHOME |
261 | CONFIG = $DEFAULTCONFIG | ||
262 | BINARY = gnunet-service-dns | 247 | BINARY = gnunet-service-dns |
263 | ACCEPT_FROM = 127.0.0.1; | 248 | ACCEPT_FROM = 127.0.0.1; |
264 | ACCEPT_FROM6 = ::1; | 249 | ACCEPT_FROM6 = ::1; |
@@ -269,7 +254,6 @@ PROVIDE_EXIT = NO | |||
269 | PORT = 20004 | 254 | PORT = 20004 |
270 | HOSTNAME = localhost | 255 | HOSTNAME = localhost |
271 | HOME = $SERVICEHOME | 256 | HOME = $SERVICEHOME |
272 | CONFIG = $DEFAULTCONFIG | ||
273 | BINARY = gnunet-service-arm | 257 | BINARY = gnunet-service-arm |
274 | ACCEPT_FROM = 127.0.0.1; | 258 | ACCEPT_FROM = 127.0.0.1; |
275 | ACCEPT_FROM6 = ::1; | 259 | ACCEPT_FROM6 = ::1; |
@@ -282,7 +266,6 @@ UNIX_MATCH_GID = YES | |||
282 | HTTPPORT = 8080 | 266 | HTTPPORT = 8080 |
283 | HOME = $SERVICEHOME | 267 | HOME = $SERVICEHOME |
284 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 268 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
285 | CONFIG = $DEFAULTCONFIG | ||
286 | BINARY = gnunet-daemon-hostlist | 269 | BINARY = gnunet-daemon-hostlist |
287 | OPTIONS = -p | 270 | OPTIONS = -p |
288 | #SERVERS = http://v9.gnunet.org:58080/ | 271 | #SERVERS = http://v9.gnunet.org:58080/ |
@@ -293,7 +276,6 @@ AUTOSTART = YES | |||
293 | PORT = 20003 | 276 | PORT = 20003 |
294 | HOSTNAME = localhost | 277 | HOSTNAME = localhost |
295 | HOME = $SERVICEHOME | 278 | HOME = $SERVICEHOME |
296 | CONFIG = $DEFAULTCONFIG | ||
297 | BINARY = gnunet-service-core | 279 | BINARY = gnunet-service-core |
298 | ACCEPT_FROM = 127.0.0.1; | 280 | ACCEPT_FROM = 127.0.0.1; |
299 | ACCEPT_FROM6 = ::1; | 281 | ACCEPT_FROM6 = ::1; |
@@ -327,7 +309,6 @@ AUTOSTART = YES | |||
327 | PORT = 20001 | 309 | PORT = 20001 |
328 | HOSTNAME = localhost | 310 | HOSTNAME = localhost |
329 | HOME = $SERVICEHOME | 311 | HOME = $SERVICEHOME |
330 | CONFIG = $DEFAULTCONFIG | ||
331 | BINARY = gnunet-service-statistics | 312 | BINARY = gnunet-service-statistics |
332 | ACCEPT_FROM = 127.0.0.1; | 313 | ACCEPT_FROM = 127.0.0.1; |
333 | ACCEPT_FROM6 = ::1; | 314 | ACCEPT_FROM6 = ::1; |
@@ -340,7 +321,6 @@ AUTOSTART = YES | |||
340 | PORT = 20000 | 321 | PORT = 20000 |
341 | HOSTNAME = localhost | 322 | HOSTNAME = localhost |
342 | HOME = $SERVICEHOME | 323 | HOME = $SERVICEHOME |
343 | CONFIG = $DEFAULTCONFIG | ||
344 | BINARY = gnunet-service-dht | 324 | BINARY = gnunet-service-dht |
345 | ACCEPT_FROM = 127.0.0.1; | 325 | ACCEPT_FROM = 127.0.0.1; |
346 | ACCEPT_FROM6 = ::1; | 326 | ACCEPT_FROM6 = ::1; |
@@ -370,4 +350,4 @@ AUTOSTART = NO | |||
370 | AUTOSTART = NO | 350 | AUTOSTART = NO |
371 | 351 | ||
372 | [lockmanager] | 352 | [lockmanager] |
373 | AUTOSTART = NO \ No newline at end of file | 353 | AUTOSTART = NO |
diff --git a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf index 5081553c9..77dcd7427 100644 --- a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf +++ b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_bootstrap_server/ | 2 | SERVICEHOME = /tmp/c_bootstrap_server/ |
3 | DEFAULTCONFIG = confs/c_bootstrap_server_w_massif.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -11,7 +10,6 @@ AUTOSTART = YES | |||
11 | PORT = 0 | 10 | PORT = 0 |
12 | HOSTNAME = localhost | 11 | HOSTNAME = localhost |
13 | HOME = $SERVICEHOME | 12 | HOME = $SERVICEHOME |
14 | CONFIG = $DEFAULTCONFIG | ||
15 | BINARY = gnunet-service-dns | 13 | BINARY = gnunet-service-dns |
16 | ACCEPT_FROM = 127.0.0.1; | 14 | ACCEPT_FROM = 127.0.0.1; |
17 | ACCEPT_FROM6 = ::1; | 15 | ACCEPT_FROM6 = ::1; |
@@ -22,7 +20,6 @@ AUTOSTART = YES | |||
22 | PORT = 20017 | 20 | PORT = 20017 |
23 | HOSTNAME = localhost | 21 | HOSTNAME = localhost |
24 | HOME = $SERVICEHOME | 22 | HOME = $SERVICEHOME |
25 | CONFIG = $DEFAULTCONFIG | ||
26 | BINARY = gnunet-service-resolver | 23 | BINARY = gnunet-service-resolver |
27 | ACCEPT_FROM = 127.0.0.1; | 24 | ACCEPT_FROM = 127.0.0.1; |
28 | ACCEPT_FROM6 = ::1; | 25 | ACCEPT_FROM6 = ::1; |
@@ -35,7 +32,6 @@ AUTOSTART = YES | |||
35 | PORT = 20016 | 32 | PORT = 20016 |
36 | HOSTNAME = localhost | 33 | HOSTNAME = localhost |
37 | HOME = $SERVICEHOME | 34 | HOME = $SERVICEHOME |
38 | CONFIG = $DEFAULTCONFIG | ||
39 | BINARY = gnunet-service-mesh | 35 | BINARY = gnunet-service-mesh |
40 | ACCEPT_FROM = 127.0.0.1; | 36 | ACCEPT_FROM = 127.0.0.1; |
41 | ACCEPT_FROM6 = ::1; | 37 | ACCEPT_FROM6 = ::1; |
@@ -48,7 +44,6 @@ AUTOSTART = YES | |||
48 | PORT = 20015 | 44 | PORT = 20015 |
49 | HOSTNAME = localhost | 45 | HOSTNAME = localhost |
50 | HOME = $SERVICEHOME | 46 | HOME = $SERVICEHOME |
51 | CONFIG = $DEFAULTCONFIG | ||
52 | BINARY = gnunet-service-nse | 47 | BINARY = gnunet-service-nse |
53 | ACCEPT_FROM = 127.0.0.1; | 48 | ACCEPT_FROM = 127.0.0.1; |
54 | ACCEPT_FROM6 = ::1; | 49 | ACCEPT_FROM6 = ::1; |
@@ -67,7 +62,6 @@ FRIENDS-ONLY = NO | |||
67 | AUTOCONNECT = YES | 62 | AUTOCONNECT = YES |
68 | TARGET-CONNECTION-COUNT = 16 | 63 | TARGET-CONNECTION-COUNT = 16 |
69 | FRIENDS = $SERVICEHOME/friends | 64 | FRIENDS = $SERVICEHOME/friends |
70 | CONFIG = $DEFAULTCONFIG | ||
71 | BINARY = gnunet-daemon-topology | 65 | BINARY = gnunet-daemon-topology |
72 | 66 | ||
73 | [datastore] | 67 | [datastore] |
@@ -78,7 +72,6 @@ UNIX_MATCH_GID = YES | |||
78 | PORT = 20014 | 72 | PORT = 20014 |
79 | HOSTNAME = localhost | 73 | HOSTNAME = localhost |
80 | HOME = $SERVICEHOME | 74 | HOME = $SERVICEHOME |
81 | CONFIG = $DEFAULTCONFIG | ||
82 | BINARY = gnunet-service-datastore | 75 | BINARY = gnunet-service-datastore |
83 | ACCEPT_FROM = 127.0.0.1; | 76 | ACCEPT_FROM = 127.0.0.1; |
84 | ACCEPT_FROM6 = ::1; | 77 | ACCEPT_FROM6 = ::1; |
@@ -101,7 +94,6 @@ AUTOSTART = YES | |||
101 | PORT = 20013 | 94 | PORT = 20013 |
102 | HOSTNAME = localhost | 95 | HOSTNAME = localhost |
103 | HOME = $SERVICEHOME | 96 | HOME = $SERVICEHOME |
104 | CONFIG = $DEFAULTCONFIG | ||
105 | BINARY = gnunet-service-peerinfo | 97 | BINARY = gnunet-service-peerinfo |
106 | ACCEPT_FROM = 127.0.0.1; | 98 | ACCEPT_FROM = 127.0.0.1; |
107 | ACCEPT_FROM6 = ::1; | 99 | ACCEPT_FROM6 = ::1; |
@@ -125,7 +117,6 @@ AUTOSTART = YES | |||
125 | PORT = 20012 | 117 | PORT = 20012 |
126 | HOSTNAME = localhost | 118 | HOSTNAME = localhost |
127 | HOME = $SERVICEHOME | 119 | HOME = $SERVICEHOME |
128 | CONFIG = $DEFAULTCONFIG | ||
129 | BINARY = gnunet-service-ats | 120 | BINARY = gnunet-service-ats |
130 | ACCEPT_FROM = 127.0.0.1; | 121 | ACCEPT_FROM = 127.0.0.1; |
131 | ACCEPT_FROM6 = ::1; | 122 | ACCEPT_FROM6 = ::1; |
@@ -148,7 +139,6 @@ AUTOSTART = YES | |||
148 | PORT = 20011 | 139 | PORT = 20011 |
149 | HOSTNAME = localhost | 140 | HOSTNAME = localhost |
150 | HOME = $SERVICEHOME | 141 | HOME = $SERVICEHOME |
151 | CONFIG = $DEFAULTCONFIG | ||
152 | BINARY = gnunet-service-transport | 142 | BINARY = gnunet-service-transport |
153 | NEIGHBOUR_LIMIT = 50 | 143 | NEIGHBOUR_LIMIT = 50 |
154 | ACCEPT_FROM = 127.0.0.1; | 144 | ACCEPT_FROM = 127.0.0.1; |
@@ -200,7 +190,6 @@ AUTOSTART = NO | |||
200 | PORT = 20006 | 190 | PORT = 20006 |
201 | HOSTNAME = localhost | 191 | HOSTNAME = localhost |
202 | HOME = $SERVICEHOME | 192 | HOME = $SERVICEHOME |
203 | CONFIG = $DEFAULTCONFIG | ||
204 | BINARY = gnunet-service-template | 193 | BINARY = gnunet-service-template |
205 | ACCEPT_FROM = 127.0.0.1; | 194 | ACCEPT_FROM = 127.0.0.1; |
206 | ACCEPT_FROM6 = ::1; | 195 | ACCEPT_FROM6 = ::1; |
@@ -218,7 +207,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
218 | PORT = 20005 | 207 | PORT = 20005 |
219 | HOSTNAME = localhost | 208 | HOSTNAME = localhost |
220 | HOME = $SERVICEHOME | 209 | HOME = $SERVICEHOME |
221 | CONFIG = $DEFAULTCONFIG | ||
222 | BINARY = gnunet-service-fs | 210 | BINARY = gnunet-service-fs |
223 | ACCEPT_FROM = 127.0.0.1; | 211 | ACCEPT_FROM = 127.0.0.1; |
224 | ACCEPT_FROM6 = ::1; | 212 | ACCEPT_FROM6 = ::1; |
@@ -233,7 +221,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
233 | EXPECTED_NEIGHBOUR_COUNT = 128 | 221 | EXPECTED_NEIGHBOUR_COUNT = 128 |
234 | 222 | ||
235 | [vpn] | 223 | [vpn] |
236 | CONFIG = $DEFAULTCONFIG | ||
237 | BINARY = gnunet-daemon-vpn | 224 | BINARY = gnunet-daemon-vpn |
238 | IPV6ADDR = 1234::1 | 225 | IPV6ADDR = 1234::1 |
239 | IPV6PREFIX = 32 | 226 | IPV6PREFIX = 32 |
@@ -244,7 +231,6 @@ VIRTDNS6 = 1234::17 | |||
244 | IFNAME = vpn-gnunet | 231 | IFNAME = vpn-gnunet |
245 | 232 | ||
246 | [exit] | 233 | [exit] |
247 | CONFIG = $DEFAULTCONFIG | ||
248 | BINARY = gnunet-daemon-exit | 234 | BINARY = gnunet-daemon-exit |
249 | IPV6ADDR = 1234:1::1 | 235 | IPV6ADDR = 1234:1::1 |
250 | IPV6PREFIX = 32 | 236 | IPV6PREFIX = 32 |
@@ -259,7 +245,6 @@ AUTOSTART = YES | |||
259 | PORT = 0 | 245 | PORT = 0 |
260 | HOSTNAME = localhost | 246 | HOSTNAME = localhost |
261 | HOME = $SERVICEHOME | 247 | HOME = $SERVICEHOME |
262 | CONFIG = $DEFAULTCONFIG | ||
263 | BINARY = gnunet-service-dns | 248 | BINARY = gnunet-service-dns |
264 | ACCEPT_FROM = 127.0.0.1; | 249 | ACCEPT_FROM = 127.0.0.1; |
265 | ACCEPT_FROM6 = ::1; | 250 | ACCEPT_FROM6 = ::1; |
@@ -270,7 +255,6 @@ PROVIDE_EXIT = NO | |||
270 | PORT = 20004 | 255 | PORT = 20004 |
271 | HOSTNAME = localhost | 256 | HOSTNAME = localhost |
272 | HOME = $SERVICEHOME | 257 | HOME = $SERVICEHOME |
273 | CONFIG = $DEFAULTCONFIG | ||
274 | BINARY = gnunet-service-arm | 258 | BINARY = gnunet-service-arm |
275 | ACCEPT_FROM = 127.0.0.1; | 259 | ACCEPT_FROM = 127.0.0.1; |
276 | ACCEPT_FROM6 = ::1; | 260 | ACCEPT_FROM6 = ::1; |
@@ -283,7 +267,6 @@ UNIX_MATCH_GID = YES | |||
283 | HTTPPORT = 8080 | 267 | HTTPPORT = 8080 |
284 | HOME = $SERVICEHOME | 268 | HOME = $SERVICEHOME |
285 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 269 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
286 | CONFIG = $DEFAULTCONFIG | ||
287 | BINARY = gnunet-daemon-hostlist | 270 | BINARY = gnunet-daemon-hostlist |
288 | OPTIONS = -p | 271 | OPTIONS = -p |
289 | #SERVERS = http://v9.gnunet.org:58080/ | 272 | #SERVERS = http://v9.gnunet.org:58080/ |
@@ -294,7 +277,6 @@ AUTOSTART = YES | |||
294 | PORT = 20003 | 277 | PORT = 20003 |
295 | HOSTNAME = localhost | 278 | HOSTNAME = localhost |
296 | HOME = $SERVICEHOME | 279 | HOME = $SERVICEHOME |
297 | CONFIG = $DEFAULTCONFIG | ||
298 | BINARY = gnunet-service-core | 280 | BINARY = gnunet-service-core |
299 | ACCEPT_FROM = 127.0.0.1; | 281 | ACCEPT_FROM = 127.0.0.1; |
300 | ACCEPT_FROM6 = ::1; | 282 | ACCEPT_FROM6 = ::1; |
@@ -328,7 +310,6 @@ AUTOSTART = YES | |||
328 | PORT = 20001 | 310 | PORT = 20001 |
329 | HOSTNAME = localhost | 311 | HOSTNAME = localhost |
330 | HOME = $SERVICEHOME | 312 | HOME = $SERVICEHOME |
331 | CONFIG = $DEFAULTCONFIG | ||
332 | BINARY = gnunet-service-statistics | 313 | BINARY = gnunet-service-statistics |
333 | ACCEPT_FROM = 127.0.0.1; | 314 | ACCEPT_FROM = 127.0.0.1; |
334 | ACCEPT_FROM6 = ::1; | 315 | ACCEPT_FROM6 = ::1; |
@@ -341,7 +322,6 @@ AUTOSTART = YES | |||
341 | PORT = 20000 | 322 | PORT = 20000 |
342 | HOSTNAME = localhost | 323 | HOSTNAME = localhost |
343 | HOME = $SERVICEHOME | 324 | HOME = $SERVICEHOME |
344 | CONFIG = $DEFAULTCONFIG | ||
345 | BINARY = gnunet-service-dht | 325 | BINARY = gnunet-service-dht |
346 | ACCEPT_FROM = 127.0.0.1; | 326 | ACCEPT_FROM = 127.0.0.1; |
347 | ACCEPT_FROM6 = ::1; | 327 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf index 9e12bb9fa..ffba6d560 100644 --- a/src/integration-tests/confs/c_nat_client.conf +++ b/src/integration-tests/confs/c_nat_client.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_nat_client | 2 | SERVICEHOME = /tmp/c_nat_client |
3 | DEFAULTCONFIG = confs/c_nat_client.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | HOSTKEY = hostkeys/0002-hostkey | 5 | HOSTKEY = hostkeys/0002-hostkey |
@@ -19,7 +18,6 @@ AUTOSTART = YES | |||
19 | PORT = 0 | 18 | PORT = 0 |
20 | HOSTNAME = localhost | 19 | HOSTNAME = localhost |
21 | HOME = $SERVICEHOME | 20 | HOME = $SERVICEHOME |
22 | CONFIG = $DEFAULTCONFIG | ||
23 | BINARY = gnunet-service-dns | 21 | BINARY = gnunet-service-dns |
24 | ACCEPT_FROM = 127.0.0.1; | 22 | ACCEPT_FROM = 127.0.0.1; |
25 | ACCEPT_FROM6 = ::1; | 23 | ACCEPT_FROM6 = ::1; |
@@ -31,7 +29,6 @@ AUTOSTART = YES | |||
31 | PORT = 20071 | 29 | PORT = 20071 |
32 | HOSTNAME = localhost | 30 | HOSTNAME = localhost |
33 | HOME = $SERVICEHOME | 31 | HOME = $SERVICEHOME |
34 | CONFIG = $DEFAULTCONFIG | ||
35 | BINARY = gnunet-service-resolver | 32 | BINARY = gnunet-service-resolver |
36 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
37 | ACCEPT_FROM6 = ::1; | 34 | ACCEPT_FROM6 = ::1; |
@@ -44,7 +41,6 @@ AUTOSTART = YES | |||
44 | PORT = 20070 | 41 | PORT = 20070 |
45 | HOSTNAME = localhost | 42 | HOSTNAME = localhost |
46 | HOME = $SERVICEHOME | 43 | HOME = $SERVICEHOME |
47 | CONFIG = $DEFAULTCONFIG | ||
48 | BINARY = gnunet-service-mesh | 44 | BINARY = gnunet-service-mesh |
49 | ACCEPT_FROM = 127.0.0.1; | 45 | ACCEPT_FROM = 127.0.0.1; |
50 | ACCEPT_FROM6 = ::1; | 46 | ACCEPT_FROM6 = ::1; |
@@ -57,7 +53,6 @@ AUTOSTART = YES | |||
57 | PORT = 20069 | 53 | PORT = 20069 |
58 | HOSTNAME = localhost | 54 | HOSTNAME = localhost |
59 | HOME = $SERVICEHOME | 55 | HOME = $SERVICEHOME |
60 | CONFIG = $DEFAULTCONFIG | ||
61 | BINARY = gnunet-service-nse | 56 | BINARY = gnunet-service-nse |
62 | ACCEPT_FROM = 127.0.0.1; | 57 | ACCEPT_FROM = 127.0.0.1; |
63 | ACCEPT_FROM6 = ::1; | 58 | ACCEPT_FROM6 = ::1; |
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO | |||
76 | AUTOCONNECT = YES | 71 | AUTOCONNECT = YES |
77 | TARGET-CONNECTION-COUNT = 16 | 72 | TARGET-CONNECTION-COUNT = 16 |
78 | FRIENDS = $SERVICEHOME/friends | 73 | FRIENDS = $SERVICEHOME/friends |
79 | CONFIG = $DEFAULTCONFIG | ||
80 | BINARY = gnunet-daemon-topology | 74 | BINARY = gnunet-daemon-topology |
81 | 75 | ||
82 | [datastore] | 76 | [datastore] |
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES | |||
87 | PORT = 20068 | 81 | PORT = 20068 |
88 | HOSTNAME = localhost | 82 | HOSTNAME = localhost |
89 | HOME = $SERVICEHOME | 83 | HOME = $SERVICEHOME |
90 | CONFIG = $DEFAULTCONFIG | ||
91 | BINARY = gnunet-service-datastore | 84 | BINARY = gnunet-service-datastore |
92 | ACCEPT_FROM = 127.0.0.1; | 85 | ACCEPT_FROM = 127.0.0.1; |
93 | ACCEPT_FROM6 = ::1; | 86 | ACCEPT_FROM6 = ::1; |
@@ -110,7 +103,6 @@ AUTOSTART = YES | |||
110 | PORT = 20067 | 103 | PORT = 20067 |
111 | HOSTNAME = localhost | 104 | HOSTNAME = localhost |
112 | HOME = $SERVICEHOME | 105 | HOME = $SERVICEHOME |
113 | CONFIG = $DEFAULTCONFIG | ||
114 | BINARY = gnunet-service-peerinfo | 106 | BINARY = gnunet-service-peerinfo |
115 | ACCEPT_FROM = 127.0.0.1; | 107 | ACCEPT_FROM = 127.0.0.1; |
116 | ACCEPT_FROM6 = ::1; | 108 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20066 | 123 | PORT = 20066 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -153,7 +144,6 @@ AUTOSTART = YES | |||
153 | PORT = 20065 | 144 | PORT = 20065 |
154 | HOSTNAME = localhost | 145 | HOSTNAME = localhost |
155 | HOME = $SERVICEHOME | 146 | HOME = $SERVICEHOME |
156 | CONFIG = $DEFAULTCONFIG | ||
157 | BINARY = gnunet-service-transport | 147 | BINARY = gnunet-service-transport |
158 | NEIGHBOUR_LIMIT = 50 | 148 | NEIGHBOUR_LIMIT = 50 |
159 | ACCEPT_FROM = 127.0.0.1; | 149 | ACCEPT_FROM = 127.0.0.1; |
@@ -205,7 +195,6 @@ AUTOSTART = NO | |||
205 | PORT = 20060 | 195 | PORT = 20060 |
206 | HOSTNAME = localhost | 196 | HOSTNAME = localhost |
207 | HOME = $SERVICEHOME | 197 | HOME = $SERVICEHOME |
208 | CONFIG = $DEFAULTCONFIG | ||
209 | BINARY = gnunet-service-template | 198 | BINARY = gnunet-service-template |
210 | ACCEPT_FROM = 127.0.0.1; | 199 | ACCEPT_FROM = 127.0.0.1; |
211 | ACCEPT_FROM6 = ::1; | 200 | ACCEPT_FROM6 = ::1; |
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
223 | PORT = 20059 | 212 | PORT = 20059 |
224 | HOSTNAME = localhost | 213 | HOSTNAME = localhost |
225 | HOME = $SERVICEHOME | 214 | HOME = $SERVICEHOME |
226 | CONFIG = $DEFAULTCONFIG | ||
227 | BINARY = gnunet-service-fs | 215 | BINARY = gnunet-service-fs |
228 | ACCEPT_FROM = 127.0.0.1; | 216 | ACCEPT_FROM = 127.0.0.1; |
229 | ACCEPT_FROM6 = ::1; | 217 | ACCEPT_FROM6 = ::1; |
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
238 | EXPECTED_NEIGHBOUR_COUNT = 128 | 226 | EXPECTED_NEIGHBOUR_COUNT = 128 |
239 | 227 | ||
240 | [vpn] | 228 | [vpn] |
241 | CONFIG = $DEFAULTCONFIG | ||
242 | BINARY = gnunet-daemon-vpn | 229 | BINARY = gnunet-daemon-vpn |
243 | IPV6ADDR = 1234::1 | 230 | IPV6ADDR = 1234::1 |
244 | IPV6PREFIX = 32 | 231 | IPV6PREFIX = 32 |
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17 | |||
249 | IFNAME = vpn-gnunet | 236 | IFNAME = vpn-gnunet |
250 | 237 | ||
251 | [exit] | 238 | [exit] |
252 | CONFIG = $DEFAULTCONFIG | ||
253 | BINARY = gnunet-daemon-exit | 239 | BINARY = gnunet-daemon-exit |
254 | IPV6ADDR = 1234:1::1 | 240 | IPV6ADDR = 1234:1::1 |
255 | IPV6PREFIX = 32 | 241 | IPV6PREFIX = 32 |
@@ -264,7 +250,6 @@ AUTOSTART = YES | |||
264 | PORT = 0 | 250 | PORT = 0 |
265 | HOSTNAME = localhost | 251 | HOSTNAME = localhost |
266 | HOME = $SERVICEHOME | 252 | HOME = $SERVICEHOME |
267 | CONFIG = $DEFAULTCONFIG | ||
268 | BINARY = gnunet-service-dns | 253 | BINARY = gnunet-service-dns |
269 | ACCEPT_FROM = 127.0.0.1; | 254 | ACCEPT_FROM = 127.0.0.1; |
270 | ACCEPT_FROM6 = ::1; | 255 | ACCEPT_FROM6 = ::1; |
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO | |||
275 | PORT = 20058 | 260 | PORT = 20058 |
276 | HOSTNAME = localhost | 261 | HOSTNAME = localhost |
277 | HOME = $SERVICEHOME | 262 | HOME = $SERVICEHOME |
278 | CONFIG = $DEFAULTCONFIG | ||
279 | BINARY = gnunet-service-arm | 263 | BINARY = gnunet-service-arm |
280 | ACCEPT_FROM = 127.0.0.1; | 264 | ACCEPT_FROM = 127.0.0.1; |
281 | ACCEPT_FROM6 = ::1; | 265 | ACCEPT_FROM6 = ::1; |
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES | |||
288 | HTTPPORT = 8080 | 272 | HTTPPORT = 8080 |
289 | HOME = $SERVICEHOME | 273 | HOME = $SERVICEHOME |
290 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 274 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
291 | CONFIG = $DEFAULTCONFIG | ||
292 | BINARY = gnunet-daemon-hostlist | 275 | BINARY = gnunet-daemon-hostlist |
293 | OPTIONS = -b | 276 | OPTIONS = -b |
294 | SERVERS = http://localhost:8080/ | 277 | SERVERS = http://localhost:8080/ |
@@ -299,7 +282,6 @@ AUTOSTART = YES | |||
299 | PORT = 20057 | 282 | PORT = 20057 |
300 | HOSTNAME = localhost | 283 | HOSTNAME = localhost |
301 | HOME = $SERVICEHOME | 284 | HOME = $SERVICEHOME |
302 | CONFIG = $DEFAULTCONFIG | ||
303 | BINARY = gnunet-service-core | 285 | BINARY = gnunet-service-core |
304 | ACCEPT_FROM = 127.0.0.1; | 286 | ACCEPT_FROM = 127.0.0.1; |
305 | ACCEPT_FROM6 = ::1; | 287 | ACCEPT_FROM6 = ::1; |
@@ -333,7 +315,6 @@ AUTOSTART = YES | |||
333 | PORT = 20055 | 315 | PORT = 20055 |
334 | HOSTNAME = localhost | 316 | HOSTNAME = localhost |
335 | HOME = $SERVICEHOME | 317 | HOME = $SERVICEHOME |
336 | CONFIG = $DEFAULTCONFIG | ||
337 | BINARY = gnunet-service-statistics | 318 | BINARY = gnunet-service-statistics |
338 | ACCEPT_FROM = 127.0.0.1; | 319 | ACCEPT_FROM = 127.0.0.1; |
339 | ACCEPT_FROM6 = ::1; | 320 | ACCEPT_FROM6 = ::1; |
@@ -346,7 +327,6 @@ AUTOSTART = YES | |||
346 | PORT = 20054 | 327 | PORT = 20054 |
347 | HOSTNAME = localhost | 328 | HOSTNAME = localhost |
348 | HOME = $SERVICEHOME | 329 | HOME = $SERVICEHOME |
349 | CONFIG = $DEFAULTCONFIG | ||
350 | BINARY = gnunet-service-dht | 330 | BINARY = gnunet-service-dht |
351 | ACCEPT_FROM = 127.0.0.1; | 331 | ACCEPT_FROM = 127.0.0.1; |
352 | ACCEPT_FROM6 = ::1; | 332 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf index e3c30f783..8d4c7e3e8 100644 --- a/src/integration-tests/confs/c_no_nat_client.conf +++ b/src/integration-tests/confs/c_no_nat_client.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_no_nat_client/ | 2 | SERVICEHOME = /tmp/c_no_nat_client/ |
3 | DEFAULTCONFIG = confs/c_no_nat_client.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -17,7 +16,6 @@ AUTOSTART = YES | |||
17 | PORT = 0 | 16 | PORT = 0 |
18 | HOSTNAME = localhost | 17 | HOSTNAME = localhost |
19 | HOME = $SERVICEHOME | 18 | HOME = $SERVICEHOME |
20 | CONFIG = $DEFAULTCONFIG | ||
21 | BINARY = gnunet-service-dns | 19 | BINARY = gnunet-service-dns |
22 | ACCEPT_FROM = 127.0.0.1; | 20 | ACCEPT_FROM = 127.0.0.1; |
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
@@ -28,7 +26,6 @@ AUTOSTART = YES | |||
28 | PORT = 20035 | 26 | PORT = 20035 |
29 | HOSTNAME = localhost | 27 | HOSTNAME = localhost |
30 | HOME = $SERVICEHOME | 28 | HOME = $SERVICEHOME |
31 | CONFIG = $DEFAULTCONFIG | ||
32 | BINARY = gnunet-service-resolver | 29 | BINARY = gnunet-service-resolver |
33 | ACCEPT_FROM = 127.0.0.1; | 30 | ACCEPT_FROM = 127.0.0.1; |
34 | ACCEPT_FROM6 = ::1; | 31 | ACCEPT_FROM6 = ::1; |
@@ -41,7 +38,6 @@ AUTOSTART = YES | |||
41 | PORT = 20034 | 38 | PORT = 20034 |
42 | HOSTNAME = localhost | 39 | HOSTNAME = localhost |
43 | HOME = $SERVICEHOME | 40 | HOME = $SERVICEHOME |
44 | CONFIG = $DEFAULTCONFIG | ||
45 | BINARY = gnunet-service-mesh | 41 | BINARY = gnunet-service-mesh |
46 | ACCEPT_FROM = 127.0.0.1; | 42 | ACCEPT_FROM = 127.0.0.1; |
47 | ACCEPT_FROM6 = ::1; | 43 | ACCEPT_FROM6 = ::1; |
@@ -54,7 +50,6 @@ AUTOSTART = YES | |||
54 | PORT = 20033 | 50 | PORT = 20033 |
55 | HOSTNAME = localhost | 51 | HOSTNAME = localhost |
56 | HOME = $SERVICEHOME | 52 | HOME = $SERVICEHOME |
57 | CONFIG = $DEFAULTCONFIG | ||
58 | BINARY = gnunet-service-nse | 53 | BINARY = gnunet-service-nse |
59 | ACCEPT_FROM = 127.0.0.1; | 54 | ACCEPT_FROM = 127.0.0.1; |
60 | ACCEPT_FROM6 = ::1; | 55 | ACCEPT_FROM6 = ::1; |
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO | |||
73 | AUTOCONNECT = YES | 68 | AUTOCONNECT = YES |
74 | TARGET-CONNECTION-COUNT = 16 | 69 | TARGET-CONNECTION-COUNT = 16 |
75 | FRIENDS = $SERVICEHOME/friends | 70 | FRIENDS = $SERVICEHOME/friends |
76 | CONFIG = $DEFAULTCONFIG | ||
77 | BINARY = gnunet-daemon-topology | 71 | BINARY = gnunet-daemon-topology |
78 | 72 | ||
79 | [datastore] | 73 | [datastore] |
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES | |||
84 | PORT = 20032 | 78 | PORT = 20032 |
85 | HOSTNAME = localhost | 79 | HOSTNAME = localhost |
86 | HOME = $SERVICEHOME | 80 | HOME = $SERVICEHOME |
87 | CONFIG = $DEFAULTCONFIG | ||
88 | BINARY = gnunet-service-datastore | 81 | BINARY = gnunet-service-datastore |
89 | ACCEPT_FROM = 127.0.0.1; | 82 | ACCEPT_FROM = 127.0.0.1; |
90 | ACCEPT_FROM6 = ::1; | 83 | ACCEPT_FROM6 = ::1; |
@@ -107,7 +100,6 @@ AUTOSTART = YES | |||
107 | PORT = 20031 | 100 | PORT = 20031 |
108 | HOSTNAME = localhost | 101 | HOSTNAME = localhost |
109 | HOME = $SERVICEHOME | 102 | HOME = $SERVICEHOME |
110 | CONFIG = $DEFAULTCONFIG | ||
111 | BINARY = gnunet-service-peerinfo | 103 | BINARY = gnunet-service-peerinfo |
112 | ACCEPT_FROM = 127.0.0.1; | 104 | ACCEPT_FROM = 127.0.0.1; |
113 | ACCEPT_FROM6 = ::1; | 105 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20030 | 123 | PORT = 20030 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -155,7 +146,6 @@ AUTOSTART = YES | |||
155 | PORT = 20029 | 146 | PORT = 20029 |
156 | HOSTNAME = localhost | 147 | HOSTNAME = localhost |
157 | HOME = $SERVICEHOME | 148 | HOME = $SERVICEHOME |
158 | CONFIG = $DEFAULTCONFIG | ||
159 | BINARY = gnunet-service-transport | 149 | BINARY = gnunet-service-transport |
160 | NEIGHBOUR_LIMIT = 50 | 150 | NEIGHBOUR_LIMIT = 50 |
161 | ACCEPT_FROM = 127.0.0.1; | 151 | ACCEPT_FROM = 127.0.0.1; |
@@ -207,7 +197,6 @@ AUTOSTART = NO | |||
207 | PORT = 20024 | 197 | PORT = 20024 |
208 | HOSTNAME = localhost | 198 | HOSTNAME = localhost |
209 | HOME = $SERVICEHOME | 199 | HOME = $SERVICEHOME |
210 | CONFIG = $DEFAULTCONFIG | ||
211 | BINARY = gnunet-service-template | 200 | BINARY = gnunet-service-template |
212 | ACCEPT_FROM = 127.0.0.1; | 201 | ACCEPT_FROM = 127.0.0.1; |
213 | ACCEPT_FROM6 = ::1; | 202 | ACCEPT_FROM6 = ::1; |
@@ -225,7 +214,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
225 | PORT = 20023 | 214 | PORT = 20023 |
226 | HOSTNAME = localhost | 215 | HOSTNAME = localhost |
227 | HOME = $SERVICEHOME | 216 | HOME = $SERVICEHOME |
228 | CONFIG = $DEFAULTCONFIG | ||
229 | BINARY = gnunet-service-fs | 217 | BINARY = gnunet-service-fs |
230 | ACCEPT_FROM = 127.0.0.1; | 218 | ACCEPT_FROM = 127.0.0.1; |
231 | ACCEPT_FROM6 = ::1; | 219 | ACCEPT_FROM6 = ::1; |
@@ -240,7 +228,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
240 | EXPECTED_NEIGHBOUR_COUNT = 128 | 228 | EXPECTED_NEIGHBOUR_COUNT = 128 |
241 | 229 | ||
242 | [vpn] | 230 | [vpn] |
243 | CONFIG = $DEFAULTCONFIG | ||
244 | BINARY = gnunet-daemon-vpn | 231 | BINARY = gnunet-daemon-vpn |
245 | IPV6ADDR = 1234::1 | 232 | IPV6ADDR = 1234::1 |
246 | IPV6PREFIX = 32 | 233 | IPV6PREFIX = 32 |
@@ -251,7 +238,6 @@ VIRTDNS6 = 1234::17 | |||
251 | IFNAME = vpn-gnunet | 238 | IFNAME = vpn-gnunet |
252 | 239 | ||
253 | [exit] | 240 | [exit] |
254 | CONFIG = $DEFAULTCONFIG | ||
255 | BINARY = gnunet-daemon-exit | 241 | BINARY = gnunet-daemon-exit |
256 | IPV6ADDR = 1234:1::1 | 242 | IPV6ADDR = 1234:1::1 |
257 | IPV6PREFIX = 32 | 243 | IPV6PREFIX = 32 |
@@ -266,7 +252,6 @@ AUTOSTART = YES | |||
266 | PORT = 0 | 252 | PORT = 0 |
267 | HOSTNAME = localhost | 253 | HOSTNAME = localhost |
268 | HOME = $SERVICEHOME | 254 | HOME = $SERVICEHOME |
269 | CONFIG = $DEFAULTCONFIG | ||
270 | BINARY = gnunet-service-dns | 255 | BINARY = gnunet-service-dns |
271 | ACCEPT_FROM = 127.0.0.1; | 256 | ACCEPT_FROM = 127.0.0.1; |
272 | ACCEPT_FROM6 = ::1; | 257 | ACCEPT_FROM6 = ::1; |
@@ -277,7 +262,6 @@ PROVIDE_EXIT = NO | |||
277 | PORT = 20022 | 262 | PORT = 20022 |
278 | HOSTNAME = localhost | 263 | HOSTNAME = localhost |
279 | HOME = $SERVICEHOME | 264 | HOME = $SERVICEHOME |
280 | CONFIG = $DEFAULTCONFIG | ||
281 | BINARY = gnunet-service-arm | 265 | BINARY = gnunet-service-arm |
282 | ACCEPT_FROM = 127.0.0.1; | 266 | ACCEPT_FROM = 127.0.0.1; |
283 | ACCEPT_FROM6 = ::1; | 267 | ACCEPT_FROM6 = ::1; |
@@ -290,7 +274,6 @@ UNIX_MATCH_GID = YES | |||
290 | HTTPPORT = 8080 | 274 | HTTPPORT = 8080 |
291 | HOME = $SERVICEHOME | 275 | HOME = $SERVICEHOME |
292 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 276 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
293 | CONFIG = $DEFAULTCONFIG | ||
294 | BINARY = gnunet-daemon-hostlist | 277 | BINARY = gnunet-daemon-hostlist |
295 | OPTIONS = -b | 278 | OPTIONS = -b |
296 | SERVERS = http://localhost:8080/ | 279 | SERVERS = http://localhost:8080/ |
@@ -301,7 +284,6 @@ AUTOSTART = YES | |||
301 | PORT = 20021 | 284 | PORT = 20021 |
302 | HOSTNAME = localhost | 285 | HOSTNAME = localhost |
303 | HOME = $SERVICEHOME | 286 | HOME = $SERVICEHOME |
304 | CONFIG = $DEFAULTCONFIG | ||
305 | BINARY = gnunet-service-core | 287 | BINARY = gnunet-service-core |
306 | ACCEPT_FROM = 127.0.0.1; | 288 | ACCEPT_FROM = 127.0.0.1; |
307 | ACCEPT_FROM6 = ::1; | 289 | ACCEPT_FROM6 = ::1; |
@@ -335,7 +317,6 @@ AUTOSTART = YES | |||
335 | PORT = 20019 | 317 | PORT = 20019 |
336 | HOSTNAME = localhost | 318 | HOSTNAME = localhost |
337 | HOME = $SERVICEHOME | 319 | HOME = $SERVICEHOME |
338 | CONFIG = $DEFAULTCONFIG | ||
339 | BINARY = gnunet-service-statistics | 320 | BINARY = gnunet-service-statistics |
340 | ACCEPT_FROM = 127.0.0.1; | 321 | ACCEPT_FROM = 127.0.0.1; |
341 | ACCEPT_FROM6 = ::1; | 322 | ACCEPT_FROM6 = ::1; |
@@ -348,7 +329,6 @@ AUTOSTART = YES | |||
348 | PORT = 20018 | 329 | PORT = 20018 |
349 | HOSTNAME = localhost | 330 | HOSTNAME = localhost |
350 | HOME = $SERVICEHOME | 331 | HOME = $SERVICEHOME |
351 | CONFIG = $DEFAULTCONFIG | ||
352 | BINARY = gnunet-service-dht | 332 | BINARY = gnunet-service-dht |
353 | ACCEPT_FROM = 127.0.0.1; | 333 | ACCEPT_FROM = 127.0.0.1; |
354 | ACCEPT_FROM6 = ::1; | 334 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf index 2ea3a9f6d..96d391b3d 100644 --- a/src/integration-tests/confs/c_no_nat_client_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_2.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_no_nat_client_2/ | 2 | SERVICEHOME = /tmp/c_no_nat_client_2/ |
3 | DEFAULTCONFIG = confs/c_no_nat_client_2.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -11,7 +10,6 @@ AUTOSTART = YES | |||
11 | PORT = 20053 | 10 | PORT = 20053 |
12 | HOSTNAME = localhost | 11 | HOSTNAME = localhost |
13 | HOME = $SERVICEHOME | 12 | HOME = $SERVICEHOME |
14 | CONFIG = $DEFAULTCONFIG | ||
15 | BINARY = gnunet-service-resolver | 13 | BINARY = gnunet-service-resolver |
16 | ACCEPT_FROM = 127.0.0.1; | 14 | ACCEPT_FROM = 127.0.0.1; |
17 | ACCEPT_FROM6 = ::1; | 15 | ACCEPT_FROM6 = ::1; |
@@ -24,7 +22,6 @@ AUTOSTART = YES | |||
24 | PORT = 20052 | 22 | PORT = 20052 |
25 | HOSTNAME = localhost | 23 | HOSTNAME = localhost |
26 | HOME = $SERVICEHOME | 24 | HOME = $SERVICEHOME |
27 | CONFIG = $DEFAULTCONFIG | ||
28 | BINARY = gnunet-service-mesh | 25 | BINARY = gnunet-service-mesh |
29 | ACCEPT_FROM = 127.0.0.1; | 26 | ACCEPT_FROM = 127.0.0.1; |
30 | ACCEPT_FROM6 = ::1; | 27 | ACCEPT_FROM6 = ::1; |
@@ -37,7 +34,6 @@ AUTOSTART = YES | |||
37 | PORT = 20051 | 34 | PORT = 20051 |
38 | HOSTNAME = localhost | 35 | HOSTNAME = localhost |
39 | HOME = $SERVICEHOME | 36 | HOME = $SERVICEHOME |
40 | CONFIG = $DEFAULTCONFIG | ||
41 | BINARY = gnunet-service-nse | 37 | BINARY = gnunet-service-nse |
42 | ACCEPT_FROM = 127.0.0.1; | 38 | ACCEPT_FROM = 127.0.0.1; |
43 | ACCEPT_FROM6 = ::1; | 39 | ACCEPT_FROM6 = ::1; |
@@ -56,7 +52,6 @@ FRIENDS-ONLY = NO | |||
56 | AUTOCONNECT = YES | 52 | AUTOCONNECT = YES |
57 | TARGET-CONNECTION-COUNT = 16 | 53 | TARGET-CONNECTION-COUNT = 16 |
58 | FRIENDS = $SERVICEHOME/friends | 54 | FRIENDS = $SERVICEHOME/friends |
59 | CONFIG = $DEFAULTCONFIG | ||
60 | BINARY = gnunet-daemon-topology | 55 | BINARY = gnunet-daemon-topology |
61 | 56 | ||
62 | [datastore] | 57 | [datastore] |
@@ -67,7 +62,6 @@ UNIX_MATCH_GID = YES | |||
67 | PORT = 20050 | 62 | PORT = 20050 |
68 | HOSTNAME = localhost | 63 | HOSTNAME = localhost |
69 | HOME = $SERVICEHOME | 64 | HOME = $SERVICEHOME |
70 | CONFIG = $DEFAULTCONFIG | ||
71 | BINARY = gnunet-service-datastore | 65 | BINARY = gnunet-service-datastore |
72 | ACCEPT_FROM = 127.0.0.1; | 66 | ACCEPT_FROM = 127.0.0.1; |
73 | ACCEPT_FROM6 = ::1; | 67 | ACCEPT_FROM6 = ::1; |
@@ -90,7 +84,6 @@ AUTOSTART = YES | |||
90 | PORT = 20049 | 84 | PORT = 20049 |
91 | HOSTNAME = localhost | 85 | HOSTNAME = localhost |
92 | HOME = $SERVICEHOME | 86 | HOME = $SERVICEHOME |
93 | CONFIG = $DEFAULTCONFIG | ||
94 | BINARY = gnunet-service-peerinfo | 87 | BINARY = gnunet-service-peerinfo |
95 | ACCEPT_FROM = 127.0.0.1; | 88 | ACCEPT_FROM = 127.0.0.1; |
96 | ACCEPT_FROM6 = ::1; | 89 | ACCEPT_FROM6 = ::1; |
@@ -114,7 +107,6 @@ AUTOSTART = YES | |||
114 | PORT = 20048 | 107 | PORT = 20048 |
115 | HOSTNAME = localhost | 108 | HOSTNAME = localhost |
116 | HOME = $SERVICEHOME | 109 | HOME = $SERVICEHOME |
117 | CONFIG = $DEFAULTCONFIG | ||
118 | BINARY = gnunet-service-ats | 110 | BINARY = gnunet-service-ats |
119 | ACCEPT_FROM = 127.0.0.1; | 111 | ACCEPT_FROM = 127.0.0.1; |
120 | ACCEPT_FROM6 = ::1; | 112 | ACCEPT_FROM6 = ::1; |
@@ -136,7 +128,6 @@ AUTOSTART = YES | |||
136 | PORT = 20047 | 128 | PORT = 20047 |
137 | HOSTNAME = localhost | 129 | HOSTNAME = localhost |
138 | HOME = $SERVICEHOME | 130 | HOME = $SERVICEHOME |
139 | CONFIG = $DEFAULTCONFIG | ||
140 | BINARY = gnunet-service-transport | 131 | BINARY = gnunet-service-transport |
141 | NEIGHBOUR_LIMIT = 50 | 132 | NEIGHBOUR_LIMIT = 50 |
142 | ACCEPT_FROM = 127.0.0.1; | 133 | ACCEPT_FROM = 127.0.0.1; |
@@ -188,7 +179,6 @@ AUTOSTART = NO | |||
188 | PORT = 20042 | 179 | PORT = 20042 |
189 | HOSTNAME = localhost | 180 | HOSTNAME = localhost |
190 | HOME = $SERVICEHOME | 181 | HOME = $SERVICEHOME |
191 | CONFIG = $DEFAULTCONFIG | ||
192 | BINARY = gnunet-service-template | 182 | BINARY = gnunet-service-template |
193 | ACCEPT_FROM = 127.0.0.1; | 183 | ACCEPT_FROM = 127.0.0.1; |
194 | ACCEPT_FROM6 = ::1; | 184 | ACCEPT_FROM6 = ::1; |
@@ -206,7 +196,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
206 | PORT = 20041 | 196 | PORT = 20041 |
207 | HOSTNAME = localhost | 197 | HOSTNAME = localhost |
208 | HOME = $SERVICEHOME | 198 | HOME = $SERVICEHOME |
209 | CONFIG = $DEFAULTCONFIG | ||
210 | BINARY = gnunet-service-fs | 199 | BINARY = gnunet-service-fs |
211 | ACCEPT_FROM = 127.0.0.1; | 200 | ACCEPT_FROM = 127.0.0.1; |
212 | ACCEPT_FROM6 = ::1; | 201 | ACCEPT_FROM6 = ::1; |
@@ -221,7 +210,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
221 | EXPECTED_NEIGHBOUR_COUNT = 128 | 210 | EXPECTED_NEIGHBOUR_COUNT = 128 |
222 | 211 | ||
223 | [vpn] | 212 | [vpn] |
224 | CONFIG = $DEFAULTCONFIG | ||
225 | BINARY = gnunet-daemon-vpn | 213 | BINARY = gnunet-daemon-vpn |
226 | IPV6ADDR = 1234::1 | 214 | IPV6ADDR = 1234::1 |
227 | IPV6PREFIX = 32 | 215 | IPV6PREFIX = 32 |
@@ -232,7 +220,6 @@ VIRTDNS6 = 1234::17 | |||
232 | IFNAME = vpn-gnunet | 220 | IFNAME = vpn-gnunet |
233 | 221 | ||
234 | [exit] | 222 | [exit] |
235 | CONFIG = $DEFAULTCONFIG | ||
236 | BINARY = gnunet-daemon-exit | 223 | BINARY = gnunet-daemon-exit |
237 | IPV6ADDR = 1234:1::1 | 224 | IPV6ADDR = 1234:1::1 |
238 | IPV6PREFIX = 32 | 225 | IPV6PREFIX = 32 |
@@ -247,7 +234,6 @@ AUTOSTART = YES | |||
247 | PORT = 0 | 234 | PORT = 0 |
248 | HOSTNAME = localhost | 235 | HOSTNAME = localhost |
249 | HOME = $SERVICEHOME | 236 | HOME = $SERVICEHOME |
250 | CONFIG = $DEFAULTCONFIG | ||
251 | BINARY = gnunet-service-dns | 237 | BINARY = gnunet-service-dns |
252 | ACCEPT_FROM = 127.0.0.1; | 238 | ACCEPT_FROM = 127.0.0.1; |
253 | ACCEPT_FROM6 = ::1; | 239 | ACCEPT_FROM6 = ::1; |
@@ -258,7 +244,6 @@ PROVIDE_EXIT = NO | |||
258 | PORT = 20040 | 244 | PORT = 20040 |
259 | HOSTNAME = localhost | 245 | HOSTNAME = localhost |
260 | HOME = $SERVICEHOME | 246 | HOME = $SERVICEHOME |
261 | CONFIG = $DEFAULTCONFIG | ||
262 | BINARY = gnunet-service-arm | 247 | BINARY = gnunet-service-arm |
263 | ACCEPT_FROM = 127.0.0.1; | 248 | ACCEPT_FROM = 127.0.0.1; |
264 | ACCEPT_FROM6 = ::1; | 249 | ACCEPT_FROM6 = ::1; |
@@ -271,7 +256,6 @@ UNIX_MATCH_GID = YES | |||
271 | HTTPPORT = 8080 | 256 | HTTPPORT = 8080 |
272 | HOME = $SERVICEHOME | 257 | HOME = $SERVICEHOME |
273 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 258 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
274 | CONFIG = $DEFAULTCONFIG | ||
275 | BINARY = gnunet-daemon-hostlist | 259 | BINARY = gnunet-daemon-hostlist |
276 | OPTIONS = -b | 260 | OPTIONS = -b |
277 | SERVERS = http://localhost:8080/ | 261 | SERVERS = http://localhost:8080/ |
@@ -282,7 +266,6 @@ AUTOSTART = YES | |||
282 | PORT = 20039 | 266 | PORT = 20039 |
283 | HOSTNAME = localhost | 267 | HOSTNAME = localhost |
284 | HOME = $SERVICEHOME | 268 | HOME = $SERVICEHOME |
285 | CONFIG = $DEFAULTCONFIG | ||
286 | BINARY = gnunet-service-core | 269 | BINARY = gnunet-service-core |
287 | ACCEPT_FROM = 127.0.0.1; | 270 | ACCEPT_FROM = 127.0.0.1; |
288 | ACCEPT_FROM6 = ::1; | 271 | ACCEPT_FROM6 = ::1; |
@@ -316,7 +299,6 @@ AUTOSTART = YES | |||
316 | PORT = 20037 | 299 | PORT = 20037 |
317 | HOSTNAME = localhost | 300 | HOSTNAME = localhost |
318 | HOME = $SERVICEHOME | 301 | HOME = $SERVICEHOME |
319 | CONFIG = $DEFAULTCONFIG | ||
320 | BINARY = gnunet-service-statistics | 302 | BINARY = gnunet-service-statistics |
321 | ACCEPT_FROM = 127.0.0.1; | 303 | ACCEPT_FROM = 127.0.0.1; |
322 | ACCEPT_FROM6 = ::1; | 304 | ACCEPT_FROM6 = ::1; |
@@ -329,7 +311,6 @@ AUTOSTART = YES | |||
329 | PORT = 20036 | 311 | PORT = 20036 |
330 | HOSTNAME = localhost | 312 | HOSTNAME = localhost |
331 | HOME = $SERVICEHOME | 313 | HOME = $SERVICEHOME |
332 | CONFIG = $DEFAULTCONFIG | ||
333 | BINARY = gnunet-service-dht | 314 | BINARY = gnunet-service-dht |
334 | ACCEPT_FROM = 127.0.0.1; | 315 | ACCEPT_FROM = 127.0.0.1; |
335 | ACCEPT_FROM6 = ::1; | 316 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf index 0ed1aee8f..523a4fdcf 100644 --- a/src/integration-tests/confs/c_no_nat_client_http.conf +++ b/src/integration-tests/confs/c_no_nat_client_http.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_no_nat_client/ | 2 | SERVICEHOME = /tmp/c_no_nat_client/ |
3 | DEFAULTCONFIG = confs/c_no_nat_client_http.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -17,7 +16,6 @@ AUTOSTART = YES | |||
17 | PORT = 0 | 16 | PORT = 0 |
18 | HOSTNAME = localhost | 17 | HOSTNAME = localhost |
19 | HOME = $SERVICEHOME | 18 | HOME = $SERVICEHOME |
20 | CONFIG = $DEFAULTCONFIG | ||
21 | BINARY = gnunet-service-dns | 19 | BINARY = gnunet-service-dns |
22 | ACCEPT_FROM = 127.0.0.1; | 20 | ACCEPT_FROM = 127.0.0.1; |
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
@@ -28,7 +26,6 @@ AUTOSTART = YES | |||
28 | PORT = 20035 | 26 | PORT = 20035 |
29 | HOSTNAME = localhost | 27 | HOSTNAME = localhost |
30 | HOME = $SERVICEHOME | 28 | HOME = $SERVICEHOME |
31 | CONFIG = $DEFAULTCONFIG | ||
32 | BINARY = gnunet-service-resolver | 29 | BINARY = gnunet-service-resolver |
33 | ACCEPT_FROM = 127.0.0.1; | 30 | ACCEPT_FROM = 127.0.0.1; |
34 | ACCEPT_FROM6 = ::1; | 31 | ACCEPT_FROM6 = ::1; |
@@ -41,7 +38,6 @@ AUTOSTART = YES | |||
41 | PORT = 20034 | 38 | PORT = 20034 |
42 | HOSTNAME = localhost | 39 | HOSTNAME = localhost |
43 | HOME = $SERVICEHOME | 40 | HOME = $SERVICEHOME |
44 | CONFIG = $DEFAULTCONFIG | ||
45 | BINARY = gnunet-service-mesh | 41 | BINARY = gnunet-service-mesh |
46 | ACCEPT_FROM = 127.0.0.1; | 42 | ACCEPT_FROM = 127.0.0.1; |
47 | ACCEPT_FROM6 = ::1; | 43 | ACCEPT_FROM6 = ::1; |
@@ -54,7 +50,6 @@ AUTOSTART = YES | |||
54 | PORT = 20033 | 50 | PORT = 20033 |
55 | HOSTNAME = localhost | 51 | HOSTNAME = localhost |
56 | HOME = $SERVICEHOME | 52 | HOME = $SERVICEHOME |
57 | CONFIG = $DEFAULTCONFIG | ||
58 | BINARY = gnunet-service-nse | 53 | BINARY = gnunet-service-nse |
59 | ACCEPT_FROM = 127.0.0.1; | 54 | ACCEPT_FROM = 127.0.0.1; |
60 | ACCEPT_FROM6 = ::1; | 55 | ACCEPT_FROM6 = ::1; |
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO | |||
73 | AUTOCONNECT = YES | 68 | AUTOCONNECT = YES |
74 | TARGET-CONNECTION-COUNT = 16 | 69 | TARGET-CONNECTION-COUNT = 16 |
75 | FRIENDS = $SERVICEHOME/friends | 70 | FRIENDS = $SERVICEHOME/friends |
76 | CONFIG = $DEFAULTCONFIG | ||
77 | BINARY = gnunet-daemon-topology | 71 | BINARY = gnunet-daemon-topology |
78 | 72 | ||
79 | [datastore] | 73 | [datastore] |
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES | |||
84 | PORT = 20032 | 78 | PORT = 20032 |
85 | HOSTNAME = localhost | 79 | HOSTNAME = localhost |
86 | HOME = $SERVICEHOME | 80 | HOME = $SERVICEHOME |
87 | CONFIG = $DEFAULTCONFIG | ||
88 | BINARY = gnunet-service-datastore | 81 | BINARY = gnunet-service-datastore |
89 | ACCEPT_FROM = 127.0.0.1; | 82 | ACCEPT_FROM = 127.0.0.1; |
90 | ACCEPT_FROM6 = ::1; | 83 | ACCEPT_FROM6 = ::1; |
@@ -107,7 +100,6 @@ AUTOSTART = YES | |||
107 | PORT = 20031 | 100 | PORT = 20031 |
108 | HOSTNAME = localhost | 101 | HOSTNAME = localhost |
109 | HOME = $SERVICEHOME | 102 | HOME = $SERVICEHOME |
110 | CONFIG = $DEFAULTCONFIG | ||
111 | BINARY = gnunet-service-peerinfo | 103 | BINARY = gnunet-service-peerinfo |
112 | ACCEPT_FROM = 127.0.0.1; | 104 | ACCEPT_FROM = 127.0.0.1; |
113 | ACCEPT_FROM6 = ::1; | 105 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20030 | 123 | PORT = 20030 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -155,7 +146,6 @@ AUTOSTART = YES | |||
155 | PORT = 20029 | 146 | PORT = 20029 |
156 | HOSTNAME = localhost | 147 | HOSTNAME = localhost |
157 | HOME = $SERVICEHOME | 148 | HOME = $SERVICEHOME |
158 | CONFIG = $DEFAULTCONFIG | ||
159 | BINARY = gnunet-service-transport | 149 | BINARY = gnunet-service-transport |
160 | NEIGHBOUR_LIMIT = 50 | 150 | NEIGHBOUR_LIMIT = 50 |
161 | ACCEPT_FROM = 127.0.0.1; | 151 | ACCEPT_FROM = 127.0.0.1; |
@@ -207,7 +197,6 @@ AUTOSTART = NO | |||
207 | PORT = 20024 | 197 | PORT = 20024 |
208 | HOSTNAME = localhost | 198 | HOSTNAME = localhost |
209 | HOME = $SERVICEHOME | 199 | HOME = $SERVICEHOME |
210 | CONFIG = $DEFAULTCONFIG | ||
211 | BINARY = gnunet-service-template | 200 | BINARY = gnunet-service-template |
212 | ACCEPT_FROM = 127.0.0.1; | 201 | ACCEPT_FROM = 127.0.0.1; |
213 | ACCEPT_FROM6 = ::1; | 202 | ACCEPT_FROM6 = ::1; |
@@ -225,7 +214,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
225 | PORT = 20023 | 214 | PORT = 20023 |
226 | HOSTNAME = localhost | 215 | HOSTNAME = localhost |
227 | HOME = $SERVICEHOME | 216 | HOME = $SERVICEHOME |
228 | CONFIG = $DEFAULTCONFIG | ||
229 | BINARY = gnunet-service-fs | 217 | BINARY = gnunet-service-fs |
230 | ACCEPT_FROM = 127.0.0.1; | 218 | ACCEPT_FROM = 127.0.0.1; |
231 | ACCEPT_FROM6 = ::1; | 219 | ACCEPT_FROM6 = ::1; |
@@ -240,7 +228,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
240 | EXPECTED_NEIGHBOUR_COUNT = 128 | 228 | EXPECTED_NEIGHBOUR_COUNT = 128 |
241 | 229 | ||
242 | [vpn] | 230 | [vpn] |
243 | CONFIG = $DEFAULTCONFIG | ||
244 | BINARY = gnunet-daemon-vpn | 231 | BINARY = gnunet-daemon-vpn |
245 | IPV6ADDR = 1234::1 | 232 | IPV6ADDR = 1234::1 |
246 | IPV6PREFIX = 32 | 233 | IPV6PREFIX = 32 |
@@ -251,7 +238,6 @@ VIRTDNS6 = 1234::17 | |||
251 | IFNAME = vpn-gnunet | 238 | IFNAME = vpn-gnunet |
252 | 239 | ||
253 | [exit] | 240 | [exit] |
254 | CONFIG = $DEFAULTCONFIG | ||
255 | BINARY = gnunet-daemon-exit | 241 | BINARY = gnunet-daemon-exit |
256 | IPV6ADDR = 1234:1::1 | 242 | IPV6ADDR = 1234:1::1 |
257 | IPV6PREFIX = 32 | 243 | IPV6PREFIX = 32 |
@@ -266,7 +252,6 @@ AUTOSTART = YES | |||
266 | PORT = 0 | 252 | PORT = 0 |
267 | HOSTNAME = localhost | 253 | HOSTNAME = localhost |
268 | HOME = $SERVICEHOME | 254 | HOME = $SERVICEHOME |
269 | CONFIG = $DEFAULTCONFIG | ||
270 | BINARY = gnunet-service-dns | 255 | BINARY = gnunet-service-dns |
271 | ACCEPT_FROM = 127.0.0.1; | 256 | ACCEPT_FROM = 127.0.0.1; |
272 | ACCEPT_FROM6 = ::1; | 257 | ACCEPT_FROM6 = ::1; |
@@ -277,7 +262,6 @@ PROVIDE_EXIT = NO | |||
277 | PORT = 20022 | 262 | PORT = 20022 |
278 | HOSTNAME = localhost | 263 | HOSTNAME = localhost |
279 | HOME = $SERVICEHOME | 264 | HOME = $SERVICEHOME |
280 | CONFIG = $DEFAULTCONFIG | ||
281 | BINARY = gnunet-service-arm | 265 | BINARY = gnunet-service-arm |
282 | ACCEPT_FROM = 127.0.0.1; | 266 | ACCEPT_FROM = 127.0.0.1; |
283 | ACCEPT_FROM6 = ::1; | 267 | ACCEPT_FROM6 = ::1; |
@@ -290,7 +274,6 @@ UNIX_MATCH_GID = YES | |||
290 | HTTPPORT = 8080 | 274 | HTTPPORT = 8080 |
291 | HOME = $SERVICEHOME | 275 | HOME = $SERVICEHOME |
292 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 276 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
293 | CONFIG = $DEFAULTCONFIG | ||
294 | BINARY = gnunet-daemon-hostlist | 277 | BINARY = gnunet-daemon-hostlist |
295 | OPTIONS = -b | 278 | OPTIONS = -b |
296 | SERVERS = http://localhost:8080/ | 279 | SERVERS = http://localhost:8080/ |
@@ -301,7 +284,6 @@ AUTOSTART = YES | |||
301 | PORT = 20021 | 284 | PORT = 20021 |
302 | HOSTNAME = localhost | 285 | HOSTNAME = localhost |
303 | HOME = $SERVICEHOME | 286 | HOME = $SERVICEHOME |
304 | CONFIG = $DEFAULTCONFIG | ||
305 | BINARY = gnunet-service-core | 287 | BINARY = gnunet-service-core |
306 | ACCEPT_FROM = 127.0.0.1; | 288 | ACCEPT_FROM = 127.0.0.1; |
307 | ACCEPT_FROM6 = ::1; | 289 | ACCEPT_FROM6 = ::1; |
@@ -335,7 +317,6 @@ AUTOSTART = YES | |||
335 | PORT = 20019 | 317 | PORT = 20019 |
336 | HOSTNAME = localhost | 318 | HOSTNAME = localhost |
337 | HOME = $SERVICEHOME | 319 | HOME = $SERVICEHOME |
338 | CONFIG = $DEFAULTCONFIG | ||
339 | BINARY = gnunet-service-statistics | 320 | BINARY = gnunet-service-statistics |
340 | ACCEPT_FROM = 127.0.0.1; | 321 | ACCEPT_FROM = 127.0.0.1; |
341 | ACCEPT_FROM6 = ::1; | 322 | ACCEPT_FROM6 = ::1; |
@@ -348,7 +329,6 @@ AUTOSTART = YES | |||
348 | PORT = 20018 | 329 | PORT = 20018 |
349 | HOSTNAME = localhost | 330 | HOSTNAME = localhost |
350 | HOME = $SERVICEHOME | 331 | HOME = $SERVICEHOME |
351 | CONFIG = $DEFAULTCONFIG | ||
352 | BINARY = gnunet-service-dht | 332 | BINARY = gnunet-service-dht |
353 | ACCEPT_FROM = 127.0.0.1; | 333 | ACCEPT_FROM = 127.0.0.1; |
354 | ACCEPT_FROM6 = ::1; | 334 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_no_nat_client_http_2.conf b/src/integration-tests/confs/c_no_nat_client_http_2.conf index 47c861a72..1f7f08523 100644 --- a/src/integration-tests/confs/c_no_nat_client_http_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_http_2.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_no_nat_client_2/ | 2 | SERVICEHOME = /tmp/c_no_nat_client_2/ |
3 | DEFAULTCONFIG = confs/c_no_nat_client_http_2.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -17,7 +16,6 @@ AUTOSTART = YES | |||
17 | PORT = 20053 | 16 | PORT = 20053 |
18 | HOSTNAME = localhost | 17 | HOSTNAME = localhost |
19 | HOME = $SERVICEHOME | 18 | HOME = $SERVICEHOME |
20 | CONFIG = $DEFAULTCONFIG | ||
21 | BINARY = gnunet-service-resolver | 19 | BINARY = gnunet-service-resolver |
22 | ACCEPT_FROM = 127.0.0.1; | 20 | ACCEPT_FROM = 127.0.0.1; |
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
@@ -30,7 +28,6 @@ AUTOSTART = YES | |||
30 | PORT = 20052 | 28 | PORT = 20052 |
31 | HOSTNAME = localhost | 29 | HOSTNAME = localhost |
32 | HOME = $SERVICEHOME | 30 | HOME = $SERVICEHOME |
33 | CONFIG = $DEFAULTCONFIG | ||
34 | BINARY = gnunet-service-mesh | 31 | BINARY = gnunet-service-mesh |
35 | ACCEPT_FROM = 127.0.0.1; | 32 | ACCEPT_FROM = 127.0.0.1; |
36 | ACCEPT_FROM6 = ::1; | 33 | ACCEPT_FROM6 = ::1; |
@@ -43,7 +40,6 @@ AUTOSTART = YES | |||
43 | PORT = 20051 | 40 | PORT = 20051 |
44 | HOSTNAME = localhost | 41 | HOSTNAME = localhost |
45 | HOME = $SERVICEHOME | 42 | HOME = $SERVICEHOME |
46 | CONFIG = $DEFAULTCONFIG | ||
47 | BINARY = gnunet-service-nse | 43 | BINARY = gnunet-service-nse |
48 | ACCEPT_FROM = 127.0.0.1; | 44 | ACCEPT_FROM = 127.0.0.1; |
49 | ACCEPT_FROM6 = ::1; | 45 | ACCEPT_FROM6 = ::1; |
@@ -62,7 +58,6 @@ FRIENDS-ONLY = NO | |||
62 | AUTOCONNECT = YES | 58 | AUTOCONNECT = YES |
63 | TARGET-CONNECTION-COUNT = 16 | 59 | TARGET-CONNECTION-COUNT = 16 |
64 | FRIENDS = $SERVICEHOME/friends | 60 | FRIENDS = $SERVICEHOME/friends |
65 | CONFIG = $DEFAULTCONFIG | ||
66 | BINARY = gnunet-daemon-topology | 61 | BINARY = gnunet-daemon-topology |
67 | 62 | ||
68 | [datastore] | 63 | [datastore] |
@@ -73,7 +68,6 @@ UNIX_MATCH_GID = YES | |||
73 | PORT = 20050 | 68 | PORT = 20050 |
74 | HOSTNAME = localhost | 69 | HOSTNAME = localhost |
75 | HOME = $SERVICEHOME | 70 | HOME = $SERVICEHOME |
76 | CONFIG = $DEFAULTCONFIG | ||
77 | BINARY = gnunet-service-datastore | 71 | BINARY = gnunet-service-datastore |
78 | ACCEPT_FROM = 127.0.0.1; | 72 | ACCEPT_FROM = 127.0.0.1; |
79 | ACCEPT_FROM6 = ::1; | 73 | ACCEPT_FROM6 = ::1; |
@@ -96,7 +90,6 @@ AUTOSTART = YES | |||
96 | PORT = 20049 | 90 | PORT = 20049 |
97 | HOSTNAME = localhost | 91 | HOSTNAME = localhost |
98 | HOME = $SERVICEHOME | 92 | HOME = $SERVICEHOME |
99 | CONFIG = $DEFAULTCONFIG | ||
100 | BINARY = gnunet-service-peerinfo | 93 | BINARY = gnunet-service-peerinfo |
101 | ACCEPT_FROM = 127.0.0.1; | 94 | ACCEPT_FROM = 127.0.0.1; |
102 | ACCEPT_FROM6 = ::1; | 95 | ACCEPT_FROM6 = ::1; |
@@ -120,7 +113,6 @@ AUTOSTART = YES | |||
120 | PORT = 20048 | 113 | PORT = 20048 |
121 | HOSTNAME = localhost | 114 | HOSTNAME = localhost |
122 | HOME = $SERVICEHOME | 115 | HOME = $SERVICEHOME |
123 | CONFIG = $DEFAULTCONFIG | ||
124 | BINARY = gnunet-service-ats | 116 | BINARY = gnunet-service-ats |
125 | ACCEPT_FROM = 127.0.0.1; | 117 | ACCEPT_FROM = 127.0.0.1; |
126 | ACCEPT_FROM6 = ::1; | 118 | ACCEPT_FROM6 = ::1; |
@@ -144,7 +136,6 @@ AUTOSTART = YES | |||
144 | PORT = 20047 | 136 | PORT = 20047 |
145 | HOSTNAME = localhost | 137 | HOSTNAME = localhost |
146 | HOME = $SERVICEHOME | 138 | HOME = $SERVICEHOME |
147 | CONFIG = $DEFAULTCONFIG | ||
148 | BINARY = gnunet-service-transport | 139 | BINARY = gnunet-service-transport |
149 | NEIGHBOUR_LIMIT = 50 | 140 | NEIGHBOUR_LIMIT = 50 |
150 | ACCEPT_FROM = 127.0.0.1; | 141 | ACCEPT_FROM = 127.0.0.1; |
@@ -196,7 +187,6 @@ AUTOSTART = NO | |||
196 | PORT = 20042 | 187 | PORT = 20042 |
197 | HOSTNAME = localhost | 188 | HOSTNAME = localhost |
198 | HOME = $SERVICEHOME | 189 | HOME = $SERVICEHOME |
199 | CONFIG = $DEFAULTCONFIG | ||
200 | BINARY = gnunet-service-template | 190 | BINARY = gnunet-service-template |
201 | ACCEPT_FROM = 127.0.0.1; | 191 | ACCEPT_FROM = 127.0.0.1; |
202 | ACCEPT_FROM6 = ::1; | 192 | ACCEPT_FROM6 = ::1; |
@@ -214,7 +204,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
214 | PORT = 20041 | 204 | PORT = 20041 |
215 | HOSTNAME = localhost | 205 | HOSTNAME = localhost |
216 | HOME = $SERVICEHOME | 206 | HOME = $SERVICEHOME |
217 | CONFIG = $DEFAULTCONFIG | ||
218 | BINARY = gnunet-service-fs | 207 | BINARY = gnunet-service-fs |
219 | ACCEPT_FROM = 127.0.0.1; | 208 | ACCEPT_FROM = 127.0.0.1; |
220 | ACCEPT_FROM6 = ::1; | 209 | ACCEPT_FROM6 = ::1; |
@@ -229,7 +218,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
229 | EXPECTED_NEIGHBOUR_COUNT = 128 | 218 | EXPECTED_NEIGHBOUR_COUNT = 128 |
230 | 219 | ||
231 | [vpn] | 220 | [vpn] |
232 | CONFIG = $DEFAULTCONFIG | ||
233 | BINARY = gnunet-daemon-vpn | 221 | BINARY = gnunet-daemon-vpn |
234 | IPV6ADDR = 1234::1 | 222 | IPV6ADDR = 1234::1 |
235 | IPV6PREFIX = 32 | 223 | IPV6PREFIX = 32 |
@@ -240,7 +228,6 @@ VIRTDNS6 = 1234::17 | |||
240 | IFNAME = vpn-gnunet | 228 | IFNAME = vpn-gnunet |
241 | 229 | ||
242 | [exit] | 230 | [exit] |
243 | CONFIG = $DEFAULTCONFIG | ||
244 | BINARY = gnunet-daemon-exit | 231 | BINARY = gnunet-daemon-exit |
245 | IPV6ADDR = 1234:1::1 | 232 | IPV6ADDR = 1234:1::1 |
246 | IPV6PREFIX = 32 | 233 | IPV6PREFIX = 32 |
@@ -255,7 +242,6 @@ AUTOSTART = YES | |||
255 | PORT = 0 | 242 | PORT = 0 |
256 | HOSTNAME = localhost | 243 | HOSTNAME = localhost |
257 | HOME = $SERVICEHOME | 244 | HOME = $SERVICEHOME |
258 | CONFIG = $DEFAULTCONFIG | ||
259 | BINARY = gnunet-service-dns | 245 | BINARY = gnunet-service-dns |
260 | ACCEPT_FROM = 127.0.0.1; | 246 | ACCEPT_FROM = 127.0.0.1; |
261 | ACCEPT_FROM6 = ::1; | 247 | ACCEPT_FROM6 = ::1; |
@@ -266,7 +252,6 @@ PROVIDE_EXIT = NO | |||
266 | PORT = 20040 | 252 | PORT = 20040 |
267 | HOSTNAME = localhost | 253 | HOSTNAME = localhost |
268 | HOME = $SERVICEHOME | 254 | HOME = $SERVICEHOME |
269 | CONFIG = $DEFAULTCONFIG | ||
270 | BINARY = gnunet-service-arm | 255 | BINARY = gnunet-service-arm |
271 | ACCEPT_FROM = 127.0.0.1; | 256 | ACCEPT_FROM = 127.0.0.1; |
272 | ACCEPT_FROM6 = ::1; | 257 | ACCEPT_FROM6 = ::1; |
@@ -279,7 +264,6 @@ UNIX_MATCH_GID = YES | |||
279 | HTTPPORT = 8080 | 264 | HTTPPORT = 8080 |
280 | HOME = $SERVICEHOME | 265 | HOME = $SERVICEHOME |
281 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 266 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
282 | CONFIG = $DEFAULTCONFIG | ||
283 | BINARY = gnunet-daemon-hostlist | 267 | BINARY = gnunet-daemon-hostlist |
284 | OPTIONS = -b | 268 | OPTIONS = -b |
285 | SERVERS = http://localhost:8080/ | 269 | SERVERS = http://localhost:8080/ |
@@ -290,7 +274,6 @@ AUTOSTART = YES | |||
290 | PORT = 20039 | 274 | PORT = 20039 |
291 | HOSTNAME = localhost | 275 | HOSTNAME = localhost |
292 | HOME = $SERVICEHOME | 276 | HOME = $SERVICEHOME |
293 | CONFIG = $DEFAULTCONFIG | ||
294 | BINARY = gnunet-service-core | 277 | BINARY = gnunet-service-core |
295 | ACCEPT_FROM = 127.0.0.1; | 278 | ACCEPT_FROM = 127.0.0.1; |
296 | ACCEPT_FROM6 = ::1; | 279 | ACCEPT_FROM6 = ::1; |
@@ -324,7 +307,6 @@ AUTOSTART = YES | |||
324 | PORT = 20037 | 307 | PORT = 20037 |
325 | HOSTNAME = localhost | 308 | HOSTNAME = localhost |
326 | HOME = $SERVICEHOME | 309 | HOME = $SERVICEHOME |
327 | CONFIG = $DEFAULTCONFIG | ||
328 | BINARY = gnunet-service-statistics | 310 | BINARY = gnunet-service-statistics |
329 | ACCEPT_FROM = 127.0.0.1; | 311 | ACCEPT_FROM = 127.0.0.1; |
330 | ACCEPT_FROM6 = ::1; | 312 | ACCEPT_FROM6 = ::1; |
@@ -337,7 +319,6 @@ AUTOSTART = YES | |||
337 | PORT = 20036 | 319 | PORT = 20036 |
338 | HOSTNAME = localhost | 320 | HOSTNAME = localhost |
339 | HOME = $SERVICEHOME | 321 | HOME = $SERVICEHOME |
340 | CONFIG = $DEFAULTCONFIG | ||
341 | BINARY = gnunet-service-dht | 322 | BINARY = gnunet-service-dht |
342 | ACCEPT_FROM = 127.0.0.1; | 323 | ACCEPT_FROM = 127.0.0.1; |
343 | ACCEPT_FROM6 = ::1; | 324 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf index b48042908..62d679fd2 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_no_nat_client/ | 2 | SERVICEHOME = /tmp/c_no_nat_client/ |
3 | DEFAULTCONFIG = confs/c_no_nat_client_unix.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -17,7 +16,6 @@ AUTOSTART = YES | |||
17 | PORT = 0 | 16 | PORT = 0 |
18 | HOSTNAME = localhost | 17 | HOSTNAME = localhost |
19 | HOME = $SERVICEHOME | 18 | HOME = $SERVICEHOME |
20 | CONFIG = $DEFAULTCONFIG | ||
21 | BINARY = gnunet-service-dns | 19 | BINARY = gnunet-service-dns |
22 | ACCEPT_FROM = 127.0.0.1; | 20 | ACCEPT_FROM = 127.0.0.1; |
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
@@ -28,7 +26,6 @@ AUTOSTART = YES | |||
28 | PORT = 20035 | 26 | PORT = 20035 |
29 | HOSTNAME = localhost | 27 | HOSTNAME = localhost |
30 | HOME = $SERVICEHOME | 28 | HOME = $SERVICEHOME |
31 | CONFIG = $DEFAULTCONFIG | ||
32 | BINARY = gnunet-service-resolver | 29 | BINARY = gnunet-service-resolver |
33 | ACCEPT_FROM = 127.0.0.1; | 30 | ACCEPT_FROM = 127.0.0.1; |
34 | ACCEPT_FROM6 = ::1; | 31 | ACCEPT_FROM6 = ::1; |
@@ -41,7 +38,6 @@ AUTOSTART = YES | |||
41 | PORT = 20034 | 38 | PORT = 20034 |
42 | HOSTNAME = localhost | 39 | HOSTNAME = localhost |
43 | HOME = $SERVICEHOME | 40 | HOME = $SERVICEHOME |
44 | CONFIG = $DEFAULTCONFIG | ||
45 | BINARY = gnunet-service-mesh | 41 | BINARY = gnunet-service-mesh |
46 | ACCEPT_FROM = 127.0.0.1; | 42 | ACCEPT_FROM = 127.0.0.1; |
47 | ACCEPT_FROM6 = ::1; | 43 | ACCEPT_FROM6 = ::1; |
@@ -54,7 +50,6 @@ AUTOSTART = YES | |||
54 | PORT = 20033 | 50 | PORT = 20033 |
55 | HOSTNAME = localhost | 51 | HOSTNAME = localhost |
56 | HOME = $SERVICEHOME | 52 | HOME = $SERVICEHOME |
57 | CONFIG = $DEFAULTCONFIG | ||
58 | BINARY = gnunet-service-nse | 53 | BINARY = gnunet-service-nse |
59 | ACCEPT_FROM = 127.0.0.1; | 54 | ACCEPT_FROM = 127.0.0.1; |
60 | ACCEPT_FROM6 = ::1; | 55 | ACCEPT_FROM6 = ::1; |
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO | |||
73 | AUTOCONNECT = YES | 68 | AUTOCONNECT = YES |
74 | TARGET-CONNECTION-COUNT = 16 | 69 | TARGET-CONNECTION-COUNT = 16 |
75 | FRIENDS = $SERVICEHOME/friends | 70 | FRIENDS = $SERVICEHOME/friends |
76 | CONFIG = $DEFAULTCONFIG | ||
77 | BINARY = gnunet-daemon-topology | 71 | BINARY = gnunet-daemon-topology |
78 | 72 | ||
79 | [datastore] | 73 | [datastore] |
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES | |||
84 | PORT = 20032 | 78 | PORT = 20032 |
85 | HOSTNAME = localhost | 79 | HOSTNAME = localhost |
86 | HOME = $SERVICEHOME | 80 | HOME = $SERVICEHOME |
87 | CONFIG = $DEFAULTCONFIG | ||
88 | BINARY = gnunet-service-datastore | 81 | BINARY = gnunet-service-datastore |
89 | ACCEPT_FROM = 127.0.0.1; | 82 | ACCEPT_FROM = 127.0.0.1; |
90 | ACCEPT_FROM6 = ::1; | 83 | ACCEPT_FROM6 = ::1; |
@@ -107,7 +100,6 @@ AUTOSTART = YES | |||
107 | PORT = 20031 | 100 | PORT = 20031 |
108 | HOSTNAME = localhost | 101 | HOSTNAME = localhost |
109 | HOME = $SERVICEHOME | 102 | HOME = $SERVICEHOME |
110 | CONFIG = $DEFAULTCONFIG | ||
111 | BINARY = gnunet-service-peerinfo | 103 | BINARY = gnunet-service-peerinfo |
112 | ACCEPT_FROM = 127.0.0.1; | 104 | ACCEPT_FROM = 127.0.0.1; |
113 | ACCEPT_FROM6 = ::1; | 105 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20030 | 123 | PORT = 20030 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -155,7 +146,6 @@ AUTOSTART = YES | |||
155 | PORT = 20029 | 146 | PORT = 20029 |
156 | HOSTNAME = localhost | 147 | HOSTNAME = localhost |
157 | HOME = $SERVICEHOME | 148 | HOME = $SERVICEHOME |
158 | CONFIG = $DEFAULTCONFIG | ||
159 | BINARY = gnunet-service-transport | 149 | BINARY = gnunet-service-transport |
160 | NEIGHBOUR_LIMIT = 50 | 150 | NEIGHBOUR_LIMIT = 50 |
161 | ACCEPT_FROM = 127.0.0.1; | 151 | ACCEPT_FROM = 127.0.0.1; |
@@ -210,7 +200,6 @@ AUTOSTART = NO | |||
210 | PORT = 20024 | 200 | PORT = 20024 |
211 | HOSTNAME = localhost | 201 | HOSTNAME = localhost |
212 | HOME = $SERVICEHOME | 202 | HOME = $SERVICEHOME |
213 | CONFIG = $DEFAULTCONFIG | ||
214 | BINARY = gnunet-service-template | 203 | BINARY = gnunet-service-template |
215 | ACCEPT_FROM = 127.0.0.1; | 204 | ACCEPT_FROM = 127.0.0.1; |
216 | ACCEPT_FROM6 = ::1; | 205 | ACCEPT_FROM6 = ::1; |
@@ -228,7 +217,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
228 | PORT = 20023 | 217 | PORT = 20023 |
229 | HOSTNAME = localhost | 218 | HOSTNAME = localhost |
230 | HOME = $SERVICEHOME | 219 | HOME = $SERVICEHOME |
231 | CONFIG = $DEFAULTCONFIG | ||
232 | BINARY = gnunet-service-fs | 220 | BINARY = gnunet-service-fs |
233 | ACCEPT_FROM = 127.0.0.1; | 221 | ACCEPT_FROM = 127.0.0.1; |
234 | ACCEPT_FROM6 = ::1; | 222 | ACCEPT_FROM6 = ::1; |
@@ -243,7 +231,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
243 | EXPECTED_NEIGHBOUR_COUNT = 128 | 231 | EXPECTED_NEIGHBOUR_COUNT = 128 |
244 | 232 | ||
245 | [vpn] | 233 | [vpn] |
246 | CONFIG = $DEFAULTCONFIG | ||
247 | BINARY = gnunet-daemon-vpn | 234 | BINARY = gnunet-daemon-vpn |
248 | IPV6ADDR = 1234::1 | 235 | IPV6ADDR = 1234::1 |
249 | IPV6PREFIX = 32 | 236 | IPV6PREFIX = 32 |
@@ -254,7 +241,6 @@ VIRTDNS6 = 1234::17 | |||
254 | IFNAME = vpn-gnunet | 241 | IFNAME = vpn-gnunet |
255 | 242 | ||
256 | [exit] | 243 | [exit] |
257 | CONFIG = $DEFAULTCONFIG | ||
258 | BINARY = gnunet-daemon-exit | 244 | BINARY = gnunet-daemon-exit |
259 | IPV6ADDR = 1234:1::1 | 245 | IPV6ADDR = 1234:1::1 |
260 | IPV6PREFIX = 32 | 246 | IPV6PREFIX = 32 |
@@ -269,7 +255,6 @@ AUTOSTART = YES | |||
269 | PORT = 0 | 255 | PORT = 0 |
270 | HOSTNAME = localhost | 256 | HOSTNAME = localhost |
271 | HOME = $SERVICEHOME | 257 | HOME = $SERVICEHOME |
272 | CONFIG = $DEFAULTCONFIG | ||
273 | BINARY = gnunet-service-dns | 258 | BINARY = gnunet-service-dns |
274 | ACCEPT_FROM = 127.0.0.1; | 259 | ACCEPT_FROM = 127.0.0.1; |
275 | ACCEPT_FROM6 = ::1; | 260 | ACCEPT_FROM6 = ::1; |
@@ -280,7 +265,6 @@ PROVIDE_EXIT = NO | |||
280 | PORT = 20022 | 265 | PORT = 20022 |
281 | HOSTNAME = localhost | 266 | HOSTNAME = localhost |
282 | HOME = $SERVICEHOME | 267 | HOME = $SERVICEHOME |
283 | CONFIG = $DEFAULTCONFIG | ||
284 | BINARY = gnunet-service-arm | 268 | BINARY = gnunet-service-arm |
285 | ACCEPT_FROM = 127.0.0.1; | 269 | ACCEPT_FROM = 127.0.0.1; |
286 | ACCEPT_FROM6 = ::1; | 270 | ACCEPT_FROM6 = ::1; |
@@ -293,7 +277,6 @@ UNIX_MATCH_GID = YES | |||
293 | HTTPPORT = 8080 | 277 | HTTPPORT = 8080 |
294 | HOME = $SERVICEHOME | 278 | HOME = $SERVICEHOME |
295 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 279 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
296 | CONFIG = $DEFAULTCONFIG | ||
297 | BINARY = gnunet-daemon-hostlist | 280 | BINARY = gnunet-daemon-hostlist |
298 | OPTIONS = -b | 281 | OPTIONS = -b |
299 | SERVERS = http://localhost:8080/ | 282 | SERVERS = http://localhost:8080/ |
@@ -304,7 +287,6 @@ AUTOSTART = YES | |||
304 | PORT = 20021 | 287 | PORT = 20021 |
305 | HOSTNAME = localhost | 288 | HOSTNAME = localhost |
306 | HOME = $SERVICEHOME | 289 | HOME = $SERVICEHOME |
307 | CONFIG = $DEFAULTCONFIG | ||
308 | BINARY = gnunet-service-core | 290 | BINARY = gnunet-service-core |
309 | ACCEPT_FROM = 127.0.0.1; | 291 | ACCEPT_FROM = 127.0.0.1; |
310 | ACCEPT_FROM6 = ::1; | 292 | ACCEPT_FROM6 = ::1; |
@@ -338,7 +320,6 @@ AUTOSTART = YES | |||
338 | PORT = 20019 | 320 | PORT = 20019 |
339 | HOSTNAME = localhost | 321 | HOSTNAME = localhost |
340 | HOME = $SERVICEHOME | 322 | HOME = $SERVICEHOME |
341 | CONFIG = $DEFAULTCONFIG | ||
342 | BINARY = gnunet-service-statistics | 323 | BINARY = gnunet-service-statistics |
343 | ACCEPT_FROM = 127.0.0.1; | 324 | ACCEPT_FROM = 127.0.0.1; |
344 | ACCEPT_FROM6 = ::1; | 325 | ACCEPT_FROM6 = ::1; |
@@ -351,7 +332,6 @@ AUTOSTART = YES | |||
351 | PORT = 20018 | 332 | PORT = 20018 |
352 | HOSTNAME = localhost | 333 | HOSTNAME = localhost |
353 | HOME = $SERVICEHOME | 334 | HOME = $SERVICEHOME |
354 | CONFIG = $DEFAULTCONFIG | ||
355 | BINARY = gnunet-service-dht | 335 | BINARY = gnunet-service-dht |
356 | ACCEPT_FROM = 127.0.0.1; | 336 | ACCEPT_FROM = 127.0.0.1; |
357 | ACCEPT_FROM6 = ::1; | 337 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_no_nat_client_unix_2.conf b/src/integration-tests/confs/c_no_nat_client_unix_2.conf index ca4da89cb..a4080ab20 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix_2.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_no_nat_client_2/ | 2 | SERVICEHOME = /tmp/c_no_nat_client_2/ |
3 | DEFAULTCONFIG = confs/c_no_nat_client_unix_2.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -17,7 +16,6 @@ AUTOSTART = YES | |||
17 | PORT = 20053 | 16 | PORT = 20053 |
18 | HOSTNAME = localhost | 17 | HOSTNAME = localhost |
19 | HOME = $SERVICEHOME | 18 | HOME = $SERVICEHOME |
20 | CONFIG = $DEFAULTCONFIG | ||
21 | BINARY = gnunet-service-resolver | 19 | BINARY = gnunet-service-resolver |
22 | ACCEPT_FROM = 127.0.0.1; | 20 | ACCEPT_FROM = 127.0.0.1; |
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
@@ -30,7 +28,6 @@ AUTOSTART = YES | |||
30 | PORT = 20052 | 28 | PORT = 20052 |
31 | HOSTNAME = localhost | 29 | HOSTNAME = localhost |
32 | HOME = $SERVICEHOME | 30 | HOME = $SERVICEHOME |
33 | CONFIG = $DEFAULTCONFIG | ||
34 | BINARY = gnunet-service-mesh | 31 | BINARY = gnunet-service-mesh |
35 | ACCEPT_FROM = 127.0.0.1; | 32 | ACCEPT_FROM = 127.0.0.1; |
36 | ACCEPT_FROM6 = ::1; | 33 | ACCEPT_FROM6 = ::1; |
@@ -43,7 +40,6 @@ AUTOSTART = YES | |||
43 | PORT = 20051 | 40 | PORT = 20051 |
44 | HOSTNAME = localhost | 41 | HOSTNAME = localhost |
45 | HOME = $SERVICEHOME | 42 | HOME = $SERVICEHOME |
46 | CONFIG = $DEFAULTCONFIG | ||
47 | BINARY = gnunet-service-nse | 43 | BINARY = gnunet-service-nse |
48 | ACCEPT_FROM = 127.0.0.1; | 44 | ACCEPT_FROM = 127.0.0.1; |
49 | ACCEPT_FROM6 = ::1; | 45 | ACCEPT_FROM6 = ::1; |
@@ -62,7 +58,6 @@ FRIENDS-ONLY = NO | |||
62 | AUTOCONNECT = YES | 58 | AUTOCONNECT = YES |
63 | TARGET-CONNECTION-COUNT = 16 | 59 | TARGET-CONNECTION-COUNT = 16 |
64 | FRIENDS = $SERVICEHOME/friends | 60 | FRIENDS = $SERVICEHOME/friends |
65 | CONFIG = $DEFAULTCONFIG | ||
66 | BINARY = gnunet-daemon-topology | 61 | BINARY = gnunet-daemon-topology |
67 | 62 | ||
68 | [datastore] | 63 | [datastore] |
@@ -73,7 +68,6 @@ UNIX_MATCH_GID = YES | |||
73 | PORT = 20050 | 68 | PORT = 20050 |
74 | HOSTNAME = localhost | 69 | HOSTNAME = localhost |
75 | HOME = $SERVICEHOME | 70 | HOME = $SERVICEHOME |
76 | CONFIG = $DEFAULTCONFIG | ||
77 | BINARY = gnunet-service-datastore | 71 | BINARY = gnunet-service-datastore |
78 | ACCEPT_FROM = 127.0.0.1; | 72 | ACCEPT_FROM = 127.0.0.1; |
79 | ACCEPT_FROM6 = ::1; | 73 | ACCEPT_FROM6 = ::1; |
@@ -96,7 +90,6 @@ AUTOSTART = YES | |||
96 | PORT = 20049 | 90 | PORT = 20049 |
97 | HOSTNAME = localhost | 91 | HOSTNAME = localhost |
98 | HOME = $SERVICEHOME | 92 | HOME = $SERVICEHOME |
99 | CONFIG = $DEFAULTCONFIG | ||
100 | BINARY = gnunet-service-peerinfo | 93 | BINARY = gnunet-service-peerinfo |
101 | ACCEPT_FROM = 127.0.0.1; | 94 | ACCEPT_FROM = 127.0.0.1; |
102 | ACCEPT_FROM6 = ::1; | 95 | ACCEPT_FROM6 = ::1; |
@@ -120,7 +113,6 @@ AUTOSTART = YES | |||
120 | PORT = 20048 | 113 | PORT = 20048 |
121 | HOSTNAME = localhost | 114 | HOSTNAME = localhost |
122 | HOME = $SERVICEHOME | 115 | HOME = $SERVICEHOME |
123 | CONFIG = $DEFAULTCONFIG | ||
124 | BINARY = gnunet-service-ats | 116 | BINARY = gnunet-service-ats |
125 | ACCEPT_FROM = 127.0.0.1; | 117 | ACCEPT_FROM = 127.0.0.1; |
126 | ACCEPT_FROM6 = ::1; | 118 | ACCEPT_FROM6 = ::1; |
@@ -144,7 +136,6 @@ AUTOSTART = YES | |||
144 | PORT = 20047 | 136 | PORT = 20047 |
145 | HOSTNAME = localhost | 137 | HOSTNAME = localhost |
146 | HOME = $SERVICEHOME | 138 | HOME = $SERVICEHOME |
147 | CONFIG = $DEFAULTCONFIG | ||
148 | BINARY = gnunet-service-transport | 139 | BINARY = gnunet-service-transport |
149 | NEIGHBOUR_LIMIT = 50 | 140 | NEIGHBOUR_LIMIT = 50 |
150 | ACCEPT_FROM = 127.0.0.1; | 141 | ACCEPT_FROM = 127.0.0.1; |
@@ -199,7 +190,6 @@ AUTOSTART = NO | |||
199 | PORT = 20042 | 190 | PORT = 20042 |
200 | HOSTNAME = localhost | 191 | HOSTNAME = localhost |
201 | HOME = $SERVICEHOME | 192 | HOME = $SERVICEHOME |
202 | CONFIG = $DEFAULTCONFIG | ||
203 | BINARY = gnunet-service-template | 193 | BINARY = gnunet-service-template |
204 | ACCEPT_FROM = 127.0.0.1; | 194 | ACCEPT_FROM = 127.0.0.1; |
205 | ACCEPT_FROM6 = ::1; | 195 | ACCEPT_FROM6 = ::1; |
@@ -217,7 +207,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
217 | PORT = 20041 | 207 | PORT = 20041 |
218 | HOSTNAME = localhost | 208 | HOSTNAME = localhost |
219 | HOME = $SERVICEHOME | 209 | HOME = $SERVICEHOME |
220 | CONFIG = $DEFAULTCONFIG | ||
221 | BINARY = gnunet-service-fs | 210 | BINARY = gnunet-service-fs |
222 | ACCEPT_FROM = 127.0.0.1; | 211 | ACCEPT_FROM = 127.0.0.1; |
223 | ACCEPT_FROM6 = ::1; | 212 | ACCEPT_FROM6 = ::1; |
@@ -232,7 +221,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
232 | EXPECTED_NEIGHBOUR_COUNT = 128 | 221 | EXPECTED_NEIGHBOUR_COUNT = 128 |
233 | 222 | ||
234 | [vpn] | 223 | [vpn] |
235 | CONFIG = $DEFAULTCONFIG | ||
236 | BINARY = gnunet-daemon-vpn | 224 | BINARY = gnunet-daemon-vpn |
237 | IPV6ADDR = 1234::1 | 225 | IPV6ADDR = 1234::1 |
238 | IPV6PREFIX = 32 | 226 | IPV6PREFIX = 32 |
@@ -243,7 +231,6 @@ VIRTDNS6 = 1234::17 | |||
243 | IFNAME = vpn-gnunet | 231 | IFNAME = vpn-gnunet |
244 | 232 | ||
245 | [exit] | 233 | [exit] |
246 | CONFIG = $DEFAULTCONFIG | ||
247 | BINARY = gnunet-daemon-exit | 234 | BINARY = gnunet-daemon-exit |
248 | IPV6ADDR = 1234:1::1 | 235 | IPV6ADDR = 1234:1::1 |
249 | IPV6PREFIX = 32 | 236 | IPV6PREFIX = 32 |
@@ -258,7 +245,6 @@ AUTOSTART = YES | |||
258 | PORT = 0 | 245 | PORT = 0 |
259 | HOSTNAME = localhost | 246 | HOSTNAME = localhost |
260 | HOME = $SERVICEHOME | 247 | HOME = $SERVICEHOME |
261 | CONFIG = $DEFAULTCONFIG | ||
262 | BINARY = gnunet-service-dns | 248 | BINARY = gnunet-service-dns |
263 | ACCEPT_FROM = 127.0.0.1; | 249 | ACCEPT_FROM = 127.0.0.1; |
264 | ACCEPT_FROM6 = ::1; | 250 | ACCEPT_FROM6 = ::1; |
@@ -269,7 +255,6 @@ PROVIDE_EXIT = NO | |||
269 | PORT = 20040 | 255 | PORT = 20040 |
270 | HOSTNAME = localhost | 256 | HOSTNAME = localhost |
271 | HOME = $SERVICEHOME | 257 | HOME = $SERVICEHOME |
272 | CONFIG = $DEFAULTCONFIG | ||
273 | BINARY = gnunet-service-arm | 258 | BINARY = gnunet-service-arm |
274 | ACCEPT_FROM = 127.0.0.1; | 259 | ACCEPT_FROM = 127.0.0.1; |
275 | ACCEPT_FROM6 = ::1; | 260 | ACCEPT_FROM6 = ::1; |
@@ -282,7 +267,6 @@ UNIX_MATCH_GID = YES | |||
282 | HTTPPORT = 8080 | 267 | HTTPPORT = 8080 |
283 | HOME = $SERVICEHOME | 268 | HOME = $SERVICEHOME |
284 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 269 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
285 | CONFIG = $DEFAULTCONFIG | ||
286 | BINARY = gnunet-daemon-hostlist | 270 | BINARY = gnunet-daemon-hostlist |
287 | OPTIONS = -b | 271 | OPTIONS = -b |
288 | SERVERS = http://localhost:8080/ | 272 | SERVERS = http://localhost:8080/ |
@@ -293,7 +277,6 @@ AUTOSTART = YES | |||
293 | PORT = 20039 | 277 | PORT = 20039 |
294 | HOSTNAME = localhost | 278 | HOSTNAME = localhost |
295 | HOME = $SERVICEHOME | 279 | HOME = $SERVICEHOME |
296 | CONFIG = $DEFAULTCONFIG | ||
297 | BINARY = gnunet-service-core | 280 | BINARY = gnunet-service-core |
298 | ACCEPT_FROM = 127.0.0.1; | 281 | ACCEPT_FROM = 127.0.0.1; |
299 | ACCEPT_FROM6 = ::1; | 282 | ACCEPT_FROM6 = ::1; |
@@ -327,7 +310,6 @@ AUTOSTART = YES | |||
327 | PORT = 20037 | 310 | PORT = 20037 |
328 | HOSTNAME = localhost | 311 | HOSTNAME = localhost |
329 | HOME = $SERVICEHOME | 312 | HOME = $SERVICEHOME |
330 | CONFIG = $DEFAULTCONFIG | ||
331 | BINARY = gnunet-service-statistics | 313 | BINARY = gnunet-service-statistics |
332 | ACCEPT_FROM = 127.0.0.1; | 314 | ACCEPT_FROM = 127.0.0.1; |
333 | ACCEPT_FROM6 = ::1; | 315 | ACCEPT_FROM6 = ::1; |
@@ -340,7 +322,6 @@ AUTOSTART = YES | |||
340 | PORT = 20036 | 322 | PORT = 20036 |
341 | HOSTNAME = localhost | 323 | HOSTNAME = localhost |
342 | HOME = $SERVICEHOME | 324 | HOME = $SERVICEHOME |
343 | CONFIG = $DEFAULTCONFIG | ||
344 | BINARY = gnunet-service-dht | 325 | BINARY = gnunet-service-dht |
345 | ACCEPT_FROM = 127.0.0.1; | 326 | ACCEPT_FROM = 127.0.0.1; |
346 | ACCEPT_FROM6 = ::1; | 327 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf index f01cac9d1..d224670fe 100644 --- a/src/integration-tests/confs/c_normal_client_tcp.conf +++ b/src/integration-tests/confs/c_normal_client_tcp.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_normal_client | 2 | SERVICEHOME = /tmp/c_normal_client |
3 | DEFAULTCONFIG = confs/c_normal_client_tcp.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | HOSTKEY = hostkeys/0002-hostkey | 5 | HOSTKEY = hostkeys/0002-hostkey |
@@ -19,7 +18,6 @@ AUTOSTART = YES | |||
19 | PORT = 0 | 18 | PORT = 0 |
20 | HOSTNAME = localhost | 19 | HOSTNAME = localhost |
21 | HOME = $SERVICEHOME | 20 | HOME = $SERVICEHOME |
22 | CONFIG = $DEFAULTCONFIG | ||
23 | BINARY = gnunet-service-dns | 21 | BINARY = gnunet-service-dns |
24 | ACCEPT_FROM = 127.0.0.1; | 22 | ACCEPT_FROM = 127.0.0.1; |
25 | ACCEPT_FROM6 = ::1; | 23 | ACCEPT_FROM6 = ::1; |
@@ -31,7 +29,6 @@ AUTOSTART = YES | |||
31 | PORT = 20071 | 29 | PORT = 20071 |
32 | HOSTNAME = localhost | 30 | HOSTNAME = localhost |
33 | HOME = $SERVICEHOME | 31 | HOME = $SERVICEHOME |
34 | CONFIG = $DEFAULTCONFIG | ||
35 | BINARY = gnunet-service-resolver | 32 | BINARY = gnunet-service-resolver |
36 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
37 | ACCEPT_FROM6 = ::1; | 34 | ACCEPT_FROM6 = ::1; |
@@ -44,7 +41,6 @@ AUTOSTART = YES | |||
44 | PORT = 20070 | 41 | PORT = 20070 |
45 | HOSTNAME = localhost | 42 | HOSTNAME = localhost |
46 | HOME = $SERVICEHOME | 43 | HOME = $SERVICEHOME |
47 | CONFIG = $DEFAULTCONFIG | ||
48 | BINARY = gnunet-service-mesh | 44 | BINARY = gnunet-service-mesh |
49 | ACCEPT_FROM = 127.0.0.1; | 45 | ACCEPT_FROM = 127.0.0.1; |
50 | ACCEPT_FROM6 = ::1; | 46 | ACCEPT_FROM6 = ::1; |
@@ -57,7 +53,6 @@ AUTOSTART = YES | |||
57 | PORT = 20069 | 53 | PORT = 20069 |
58 | HOSTNAME = localhost | 54 | HOSTNAME = localhost |
59 | HOME = $SERVICEHOME | 55 | HOME = $SERVICEHOME |
60 | CONFIG = $DEFAULTCONFIG | ||
61 | BINARY = gnunet-service-nse | 56 | BINARY = gnunet-service-nse |
62 | ACCEPT_FROM = 127.0.0.1; | 57 | ACCEPT_FROM = 127.0.0.1; |
63 | ACCEPT_FROM6 = ::1; | 58 | ACCEPT_FROM6 = ::1; |
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO | |||
76 | AUTOCONNECT = YES | 71 | AUTOCONNECT = YES |
77 | TARGET-CONNECTION-COUNT = 16 | 72 | TARGET-CONNECTION-COUNT = 16 |
78 | FRIENDS = $SERVICEHOME/friends | 73 | FRIENDS = $SERVICEHOME/friends |
79 | CONFIG = $DEFAULTCONFIG | ||
80 | BINARY = gnunet-daemon-topology | 74 | BINARY = gnunet-daemon-topology |
81 | 75 | ||
82 | [datastore] | 76 | [datastore] |
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES | |||
87 | PORT = 20068 | 81 | PORT = 20068 |
88 | HOSTNAME = localhost | 82 | HOSTNAME = localhost |
89 | HOME = $SERVICEHOME | 83 | HOME = $SERVICEHOME |
90 | CONFIG = $DEFAULTCONFIG | ||
91 | BINARY = gnunet-service-datastore | 84 | BINARY = gnunet-service-datastore |
92 | ACCEPT_FROM = 127.0.0.1; | 85 | ACCEPT_FROM = 127.0.0.1; |
93 | ACCEPT_FROM6 = ::1; | 86 | ACCEPT_FROM6 = ::1; |
@@ -110,7 +103,6 @@ AUTOSTART = YES | |||
110 | PORT = 20067 | 103 | PORT = 20067 |
111 | HOSTNAME = localhost | 104 | HOSTNAME = localhost |
112 | HOME = $SERVICEHOME | 105 | HOME = $SERVICEHOME |
113 | CONFIG = $DEFAULTCONFIG | ||
114 | BINARY = gnunet-service-peerinfo | 106 | BINARY = gnunet-service-peerinfo |
115 | ACCEPT_FROM = 127.0.0.1; | 107 | ACCEPT_FROM = 127.0.0.1; |
116 | ACCEPT_FROM6 = ::1; | 108 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20066 | 123 | PORT = 20066 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -153,7 +144,6 @@ AUTOSTART = YES | |||
153 | PORT = 20065 | 144 | PORT = 20065 |
154 | HOSTNAME = localhost | 145 | HOSTNAME = localhost |
155 | HOME = $SERVICEHOME | 146 | HOME = $SERVICEHOME |
156 | CONFIG = $DEFAULTCONFIG | ||
157 | BINARY = gnunet-service-transport | 147 | BINARY = gnunet-service-transport |
158 | NEIGHBOUR_LIMIT = 50 | 148 | NEIGHBOUR_LIMIT = 50 |
159 | ACCEPT_FROM = 127.0.0.1; | 149 | ACCEPT_FROM = 127.0.0.1; |
@@ -205,7 +195,6 @@ AUTOSTART = NO | |||
205 | PORT = 20060 | 195 | PORT = 20060 |
206 | HOSTNAME = localhost | 196 | HOSTNAME = localhost |
207 | HOME = $SERVICEHOME | 197 | HOME = $SERVICEHOME |
208 | CONFIG = $DEFAULTCONFIG | ||
209 | BINARY = gnunet-service-template | 198 | BINARY = gnunet-service-template |
210 | ACCEPT_FROM = 127.0.0.1; | 199 | ACCEPT_FROM = 127.0.0.1; |
211 | ACCEPT_FROM6 = ::1; | 200 | ACCEPT_FROM6 = ::1; |
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
223 | PORT = 20059 | 212 | PORT = 20059 |
224 | HOSTNAME = localhost | 213 | HOSTNAME = localhost |
225 | HOME = $SERVICEHOME | 214 | HOME = $SERVICEHOME |
226 | CONFIG = $DEFAULTCONFIG | ||
227 | BINARY = gnunet-service-fs | 215 | BINARY = gnunet-service-fs |
228 | ACCEPT_FROM = 127.0.0.1; | 216 | ACCEPT_FROM = 127.0.0.1; |
229 | ACCEPT_FROM6 = ::1; | 217 | ACCEPT_FROM6 = ::1; |
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
238 | EXPECTED_NEIGHBOUR_COUNT = 128 | 226 | EXPECTED_NEIGHBOUR_COUNT = 128 |
239 | 227 | ||
240 | [vpn] | 228 | [vpn] |
241 | CONFIG = $DEFAULTCONFIG | ||
242 | BINARY = gnunet-daemon-vpn | 229 | BINARY = gnunet-daemon-vpn |
243 | IPV6ADDR = 1234::1 | 230 | IPV6ADDR = 1234::1 |
244 | IPV6PREFIX = 32 | 231 | IPV6PREFIX = 32 |
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17 | |||
249 | IFNAME = vpn-gnunet | 236 | IFNAME = vpn-gnunet |
250 | 237 | ||
251 | [exit] | 238 | [exit] |
252 | CONFIG = $DEFAULTCONFIG | ||
253 | BINARY = gnunet-daemon-exit | 239 | BINARY = gnunet-daemon-exit |
254 | IPV6ADDR = 1234:1::1 | 240 | IPV6ADDR = 1234:1::1 |
255 | IPV6PREFIX = 32 | 241 | IPV6PREFIX = 32 |
@@ -264,7 +250,6 @@ AUTOSTART = YES | |||
264 | PORT = 0 | 250 | PORT = 0 |
265 | HOSTNAME = localhost | 251 | HOSTNAME = localhost |
266 | HOME = $SERVICEHOME | 252 | HOME = $SERVICEHOME |
267 | CONFIG = $DEFAULTCONFIG | ||
268 | BINARY = gnunet-service-dns | 253 | BINARY = gnunet-service-dns |
269 | ACCEPT_FROM = 127.0.0.1; | 254 | ACCEPT_FROM = 127.0.0.1; |
270 | ACCEPT_FROM6 = ::1; | 255 | ACCEPT_FROM6 = ::1; |
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO | |||
275 | PORT = 20058 | 260 | PORT = 20058 |
276 | HOSTNAME = localhost | 261 | HOSTNAME = localhost |
277 | HOME = $SERVICEHOME | 262 | HOME = $SERVICEHOME |
278 | CONFIG = $DEFAULTCONFIG | ||
279 | BINARY = gnunet-service-arm | 263 | BINARY = gnunet-service-arm |
280 | ACCEPT_FROM = 127.0.0.1; | 264 | ACCEPT_FROM = 127.0.0.1; |
281 | ACCEPT_FROM6 = ::1; | 265 | ACCEPT_FROM6 = ::1; |
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES | |||
288 | HTTPPORT = 8080 | 272 | HTTPPORT = 8080 |
289 | HOME = $SERVICEHOME | 273 | HOME = $SERVICEHOME |
290 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 274 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
291 | CONFIG = $DEFAULTCONFIG | ||
292 | BINARY = gnunet-daemon-hostlist | 275 | BINARY = gnunet-daemon-hostlist |
293 | OPTIONS = -b | 276 | OPTIONS = -b |
294 | SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ | 277 | SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ |
@@ -299,7 +282,6 @@ AUTOSTART = YES | |||
299 | PORT = 20057 | 282 | PORT = 20057 |
300 | HOSTNAME = localhost | 283 | HOSTNAME = localhost |
301 | HOME = $SERVICEHOME | 284 | HOME = $SERVICEHOME |
302 | CONFIG = $DEFAULTCONFIG | ||
303 | BINARY = gnunet-service-core | 285 | BINARY = gnunet-service-core |
304 | ACCEPT_FROM = 127.0.0.1; | 286 | ACCEPT_FROM = 127.0.0.1; |
305 | ACCEPT_FROM6 = ::1; | 287 | ACCEPT_FROM6 = ::1; |
@@ -333,7 +315,6 @@ AUTOSTART = YES | |||
333 | PORT = 20055 | 315 | PORT = 20055 |
334 | HOSTNAME = localhost | 316 | HOSTNAME = localhost |
335 | HOME = $SERVICEHOME | 317 | HOME = $SERVICEHOME |
336 | CONFIG = $DEFAULTCONFIG | ||
337 | BINARY = gnunet-service-statistics | 318 | BINARY = gnunet-service-statistics |
338 | ACCEPT_FROM = 127.0.0.1; | 319 | ACCEPT_FROM = 127.0.0.1; |
339 | ACCEPT_FROM6 = ::1; | 320 | ACCEPT_FROM6 = ::1; |
@@ -346,7 +327,6 @@ AUTOSTART = YES | |||
346 | PORT = 20054 | 327 | PORT = 20054 |
347 | HOSTNAME = localhost | 328 | HOSTNAME = localhost |
348 | HOME = $SERVICEHOME | 329 | HOME = $SERVICEHOME |
349 | CONFIG = $DEFAULTCONFIG | ||
350 | BINARY = gnunet-service-dht | 330 | BINARY = gnunet-service-dht |
351 | ACCEPT_FROM = 127.0.0.1; | 331 | ACCEPT_FROM = 127.0.0.1; |
352 | ACCEPT_FROM6 = ::1; | 332 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp.conf b/src/integration-tests/confs/c_normal_client_tcp_udp.conf index f515609bd..b94eecd8b 100644 --- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf +++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_normal_client | 2 | SERVICEHOME = /tmp/c_normal_client |
3 | DEFAULTCONFIG = confs/c_normal_client_tcp_udp.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | HOSTKEY = hostkeys/0002-hostkey | 5 | HOSTKEY = hostkeys/0002-hostkey |
@@ -19,7 +18,6 @@ AUTOSTART = YES | |||
19 | PORT = 0 | 18 | PORT = 0 |
20 | HOSTNAME = localhost | 19 | HOSTNAME = localhost |
21 | HOME = $SERVICEHOME | 20 | HOME = $SERVICEHOME |
22 | CONFIG = $DEFAULTCONFIG | ||
23 | BINARY = gnunet-service-dns | 21 | BINARY = gnunet-service-dns |
24 | ACCEPT_FROM = 127.0.0.1; | 22 | ACCEPT_FROM = 127.0.0.1; |
25 | ACCEPT_FROM6 = ::1; | 23 | ACCEPT_FROM6 = ::1; |
@@ -31,7 +29,6 @@ AUTOSTART = YES | |||
31 | PORT = 20071 | 29 | PORT = 20071 |
32 | HOSTNAME = localhost | 30 | HOSTNAME = localhost |
33 | HOME = $SERVICEHOME | 31 | HOME = $SERVICEHOME |
34 | CONFIG = $DEFAULTCONFIG | ||
35 | BINARY = gnunet-service-resolver | 32 | BINARY = gnunet-service-resolver |
36 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
37 | ACCEPT_FROM6 = ::1; | 34 | ACCEPT_FROM6 = ::1; |
@@ -44,7 +41,6 @@ AUTOSTART = YES | |||
44 | PORT = 20070 | 41 | PORT = 20070 |
45 | HOSTNAME = localhost | 42 | HOSTNAME = localhost |
46 | HOME = $SERVICEHOME | 43 | HOME = $SERVICEHOME |
47 | CONFIG = $DEFAULTCONFIG | ||
48 | BINARY = gnunet-service-mesh | 44 | BINARY = gnunet-service-mesh |
49 | ACCEPT_FROM = 127.0.0.1; | 45 | ACCEPT_FROM = 127.0.0.1; |
50 | ACCEPT_FROM6 = ::1; | 46 | ACCEPT_FROM6 = ::1; |
@@ -57,7 +53,6 @@ AUTOSTART = YES | |||
57 | PORT = 20069 | 53 | PORT = 20069 |
58 | HOSTNAME = localhost | 54 | HOSTNAME = localhost |
59 | HOME = $SERVICEHOME | 55 | HOME = $SERVICEHOME |
60 | CONFIG = $DEFAULTCONFIG | ||
61 | BINARY = gnunet-service-nse | 56 | BINARY = gnunet-service-nse |
62 | ACCEPT_FROM = 127.0.0.1; | 57 | ACCEPT_FROM = 127.0.0.1; |
63 | ACCEPT_FROM6 = ::1; | 58 | ACCEPT_FROM6 = ::1; |
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO | |||
76 | AUTOCONNECT = YES | 71 | AUTOCONNECT = YES |
77 | TARGET-CONNECTION-COUNT = 16 | 72 | TARGET-CONNECTION-COUNT = 16 |
78 | FRIENDS = $SERVICEHOME/friends | 73 | FRIENDS = $SERVICEHOME/friends |
79 | CONFIG = $DEFAULTCONFIG | ||
80 | BINARY = gnunet-daemon-topology | 74 | BINARY = gnunet-daemon-topology |
81 | 75 | ||
82 | [datastore] | 76 | [datastore] |
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES | |||
87 | PORT = 20068 | 81 | PORT = 20068 |
88 | HOSTNAME = localhost | 82 | HOSTNAME = localhost |
89 | HOME = $SERVICEHOME | 83 | HOME = $SERVICEHOME |
90 | CONFIG = $DEFAULTCONFIG | ||
91 | BINARY = gnunet-service-datastore | 84 | BINARY = gnunet-service-datastore |
92 | ACCEPT_FROM = 127.0.0.1; | 85 | ACCEPT_FROM = 127.0.0.1; |
93 | ACCEPT_FROM6 = ::1; | 86 | ACCEPT_FROM6 = ::1; |
@@ -110,7 +103,6 @@ AUTOSTART = YES | |||
110 | PORT = 20067 | 103 | PORT = 20067 |
111 | HOSTNAME = localhost | 104 | HOSTNAME = localhost |
112 | HOME = $SERVICEHOME | 105 | HOME = $SERVICEHOME |
113 | CONFIG = $DEFAULTCONFIG | ||
114 | BINARY = gnunet-service-peerinfo | 106 | BINARY = gnunet-service-peerinfo |
115 | ACCEPT_FROM = 127.0.0.1; | 107 | ACCEPT_FROM = 127.0.0.1; |
116 | ACCEPT_FROM6 = ::1; | 108 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20066 | 123 | PORT = 20066 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -153,7 +144,6 @@ AUTOSTART = YES | |||
153 | PORT = 20065 | 144 | PORT = 20065 |
154 | HOSTNAME = localhost | 145 | HOSTNAME = localhost |
155 | HOME = $SERVICEHOME | 146 | HOME = $SERVICEHOME |
156 | CONFIG = $DEFAULTCONFIG | ||
157 | BINARY = gnunet-service-transport | 147 | BINARY = gnunet-service-transport |
158 | NEIGHBOUR_LIMIT = 50 | 148 | NEIGHBOUR_LIMIT = 50 |
159 | ACCEPT_FROM = 127.0.0.1; | 149 | ACCEPT_FROM = 127.0.0.1; |
@@ -205,7 +195,6 @@ AUTOSTART = NO | |||
205 | PORT = 20060 | 195 | PORT = 20060 |
206 | HOSTNAME = localhost | 196 | HOSTNAME = localhost |
207 | HOME = $SERVICEHOME | 197 | HOME = $SERVICEHOME |
208 | CONFIG = $DEFAULTCONFIG | ||
209 | BINARY = gnunet-service-template | 198 | BINARY = gnunet-service-template |
210 | ACCEPT_FROM = 127.0.0.1; | 199 | ACCEPT_FROM = 127.0.0.1; |
211 | ACCEPT_FROM6 = ::1; | 200 | ACCEPT_FROM6 = ::1; |
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
223 | PORT = 20059 | 212 | PORT = 20059 |
224 | HOSTNAME = localhost | 213 | HOSTNAME = localhost |
225 | HOME = $SERVICEHOME | 214 | HOME = $SERVICEHOME |
226 | CONFIG = $DEFAULTCONFIG | ||
227 | BINARY = gnunet-service-fs | 215 | BINARY = gnunet-service-fs |
228 | ACCEPT_FROM = 127.0.0.1; | 216 | ACCEPT_FROM = 127.0.0.1; |
229 | ACCEPT_FROM6 = ::1; | 217 | ACCEPT_FROM6 = ::1; |
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
238 | EXPECTED_NEIGHBOUR_COUNT = 128 | 226 | EXPECTED_NEIGHBOUR_COUNT = 128 |
239 | 227 | ||
240 | [vpn] | 228 | [vpn] |
241 | CONFIG = $DEFAULTCONFIG | ||
242 | BINARY = gnunet-daemon-vpn | 229 | BINARY = gnunet-daemon-vpn |
243 | IPV6ADDR = 1234::1 | 230 | IPV6ADDR = 1234::1 |
244 | IPV6PREFIX = 32 | 231 | IPV6PREFIX = 32 |
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17 | |||
249 | IFNAME = vpn-gnunet | 236 | IFNAME = vpn-gnunet |
250 | 237 | ||
251 | [exit] | 238 | [exit] |
252 | CONFIG = $DEFAULTCONFIG | ||
253 | BINARY = gnunet-daemon-exit | 239 | BINARY = gnunet-daemon-exit |
254 | IPV6ADDR = 1234:1::1 | 240 | IPV6ADDR = 1234:1::1 |
255 | IPV6PREFIX = 32 | 241 | IPV6PREFIX = 32 |
@@ -264,7 +250,6 @@ AUTOSTART = YES | |||
264 | PORT = 0 | 250 | PORT = 0 |
265 | HOSTNAME = localhost | 251 | HOSTNAME = localhost |
266 | HOME = $SERVICEHOME | 252 | HOME = $SERVICEHOME |
267 | CONFIG = $DEFAULTCONFIG | ||
268 | BINARY = gnunet-service-dns | 253 | BINARY = gnunet-service-dns |
269 | ACCEPT_FROM = 127.0.0.1; | 254 | ACCEPT_FROM = 127.0.0.1; |
270 | ACCEPT_FROM6 = ::1; | 255 | ACCEPT_FROM6 = ::1; |
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO | |||
275 | PORT = 20058 | 260 | PORT = 20058 |
276 | HOSTNAME = localhost | 261 | HOSTNAME = localhost |
277 | HOME = $SERVICEHOME | 262 | HOME = $SERVICEHOME |
278 | CONFIG = $DEFAULTCONFIG | ||
279 | BINARY = gnunet-service-arm | 263 | BINARY = gnunet-service-arm |
280 | ACCEPT_FROM = 127.0.0.1; | 264 | ACCEPT_FROM = 127.0.0.1; |
281 | ACCEPT_FROM6 = ::1; | 265 | ACCEPT_FROM6 = ::1; |
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES | |||
288 | HTTPPORT = 8080 | 272 | HTTPPORT = 8080 |
289 | HOME = $SERVICEHOME | 273 | HOME = $SERVICEHOME |
290 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 274 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
291 | CONFIG = $DEFAULTCONFIG | ||
292 | BINARY = gnunet-daemon-hostlist | 275 | BINARY = gnunet-daemon-hostlist |
293 | OPTIONS = -b | 276 | OPTIONS = -b |
294 | SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ | 277 | SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ |
@@ -299,7 +282,6 @@ AUTOSTART = YES | |||
299 | PORT = 20057 | 282 | PORT = 20057 |
300 | HOSTNAME = localhost | 283 | HOSTNAME = localhost |
301 | HOME = $SERVICEHOME | 284 | HOME = $SERVICEHOME |
302 | CONFIG = $DEFAULTCONFIG | ||
303 | BINARY = gnunet-service-core | 285 | BINARY = gnunet-service-core |
304 | ACCEPT_FROM = 127.0.0.1; | 286 | ACCEPT_FROM = 127.0.0.1; |
305 | ACCEPT_FROM6 = ::1; | 287 | ACCEPT_FROM6 = ::1; |
@@ -333,7 +315,6 @@ AUTOSTART = YES | |||
333 | PORT = 20055 | 315 | PORT = 20055 |
334 | HOSTNAME = localhost | 316 | HOSTNAME = localhost |
335 | HOME = $SERVICEHOME | 317 | HOME = $SERVICEHOME |
336 | CONFIG = $DEFAULTCONFIG | ||
337 | BINARY = gnunet-service-statistics | 318 | BINARY = gnunet-service-statistics |
338 | ACCEPT_FROM = 127.0.0.1; | 319 | ACCEPT_FROM = 127.0.0.1; |
339 | ACCEPT_FROM6 = ::1; | 320 | ACCEPT_FROM6 = ::1; |
@@ -346,7 +327,6 @@ AUTOSTART = YES | |||
346 | PORT = 20054 | 327 | PORT = 20054 |
347 | HOSTNAME = localhost | 328 | HOSTNAME = localhost |
348 | HOME = $SERVICEHOME | 329 | HOME = $SERVICEHOME |
349 | CONFIG = $DEFAULTCONFIG | ||
350 | BINARY = gnunet-service-dht | 330 | BINARY = gnunet-service-dht |
351 | ACCEPT_FROM = 127.0.0.1; | 331 | ACCEPT_FROM = 127.0.0.1; |
352 | ACCEPT_FROM6 = ::1; | 332 | ACCEPT_FROM6 = ::1; |
@@ -367,4 +347,4 @@ UNIX_MATCH_GID = YES | |||
367 | 347 | ||
368 | [dhtcache] | 348 | [dhtcache] |
369 | DATABASE = sqlite | 349 | DATABASE = sqlite |
370 | QUOTA = 1 MB \ No newline at end of file | 350 | QUOTA = 1 MB |
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf index a4a30c18c..c887bdae0 100644 --- a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf +++ b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_normal_client | 2 | SERVICEHOME = /tmp/c_normal_client |
3 | DEFAULTCONFIG = confs/c_normal_client_tcp_udp_http.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | HOSTKEY = hostkeys/0002-hostkey | 5 | HOSTKEY = hostkeys/0002-hostkey |
@@ -19,7 +18,6 @@ AUTOSTART = YES | |||
19 | PORT = 0 | 18 | PORT = 0 |
20 | HOSTNAME = localhost | 19 | HOSTNAME = localhost |
21 | HOME = $SERVICEHOME | 20 | HOME = $SERVICEHOME |
22 | CONFIG = $DEFAULTCONFIG | ||
23 | BINARY = gnunet-service-dns | 21 | BINARY = gnunet-service-dns |
24 | ACCEPT_FROM = 127.0.0.1; | 22 | ACCEPT_FROM = 127.0.0.1; |
25 | ACCEPT_FROM6 = ::1; | 23 | ACCEPT_FROM6 = ::1; |
@@ -31,7 +29,6 @@ AUTOSTART = YES | |||
31 | PORT = 20071 | 29 | PORT = 20071 |
32 | HOSTNAME = localhost | 30 | HOSTNAME = localhost |
33 | HOME = $SERVICEHOME | 31 | HOME = $SERVICEHOME |
34 | CONFIG = $DEFAULTCONFIG | ||
35 | BINARY = gnunet-service-resolver | 32 | BINARY = gnunet-service-resolver |
36 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
37 | ACCEPT_FROM6 = ::1; | 34 | ACCEPT_FROM6 = ::1; |
@@ -44,7 +41,6 @@ AUTOSTART = YES | |||
44 | PORT = 20070 | 41 | PORT = 20070 |
45 | HOSTNAME = localhost | 42 | HOSTNAME = localhost |
46 | HOME = $SERVICEHOME | 43 | HOME = $SERVICEHOME |
47 | CONFIG = $DEFAULTCONFIG | ||
48 | BINARY = gnunet-service-mesh | 44 | BINARY = gnunet-service-mesh |
49 | ACCEPT_FROM = 127.0.0.1; | 45 | ACCEPT_FROM = 127.0.0.1; |
50 | ACCEPT_FROM6 = ::1; | 46 | ACCEPT_FROM6 = ::1; |
@@ -57,7 +53,6 @@ AUTOSTART = YES | |||
57 | PORT = 20069 | 53 | PORT = 20069 |
58 | HOSTNAME = localhost | 54 | HOSTNAME = localhost |
59 | HOME = $SERVICEHOME | 55 | HOME = $SERVICEHOME |
60 | CONFIG = $DEFAULTCONFIG | ||
61 | BINARY = gnunet-service-nse | 56 | BINARY = gnunet-service-nse |
62 | ACCEPT_FROM = 127.0.0.1; | 57 | ACCEPT_FROM = 127.0.0.1; |
63 | ACCEPT_FROM6 = ::1; | 58 | ACCEPT_FROM6 = ::1; |
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO | |||
76 | AUTOCONNECT = YES | 71 | AUTOCONNECT = YES |
77 | TARGET-CONNECTION-COUNT = 16 | 72 | TARGET-CONNECTION-COUNT = 16 |
78 | FRIENDS = $SERVICEHOME/friends | 73 | FRIENDS = $SERVICEHOME/friends |
79 | CONFIG = $DEFAULTCONFIG | ||
80 | BINARY = gnunet-daemon-topology | 74 | BINARY = gnunet-daemon-topology |
81 | 75 | ||
82 | [datastore] | 76 | [datastore] |
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES | |||
87 | PORT = 20068 | 81 | PORT = 20068 |
88 | HOSTNAME = localhost | 82 | HOSTNAME = localhost |
89 | HOME = $SERVICEHOME | 83 | HOME = $SERVICEHOME |
90 | CONFIG = $DEFAULTCONFIG | ||
91 | BINARY = gnunet-service-datastore | 84 | BINARY = gnunet-service-datastore |
92 | ACCEPT_FROM = 127.0.0.1; | 85 | ACCEPT_FROM = 127.0.0.1; |
93 | ACCEPT_FROM6 = ::1; | 86 | ACCEPT_FROM6 = ::1; |
@@ -110,7 +103,6 @@ AUTOSTART = YES | |||
110 | PORT = 20067 | 103 | PORT = 20067 |
111 | HOSTNAME = localhost | 104 | HOSTNAME = localhost |
112 | HOME = $SERVICEHOME | 105 | HOME = $SERVICEHOME |
113 | CONFIG = $DEFAULTCONFIG | ||
114 | BINARY = gnunet-service-peerinfo | 106 | BINARY = gnunet-service-peerinfo |
115 | ACCEPT_FROM = 127.0.0.1; | 107 | ACCEPT_FROM = 127.0.0.1; |
116 | ACCEPT_FROM6 = ::1; | 108 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20066 | 123 | PORT = 20066 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -153,7 +144,6 @@ AUTOSTART = YES | |||
153 | PORT = 20065 | 144 | PORT = 20065 |
154 | HOSTNAME = localhost | 145 | HOSTNAME = localhost |
155 | HOME = $SERVICEHOME | 146 | HOME = $SERVICEHOME |
156 | CONFIG = $DEFAULTCONFIG | ||
157 | BINARY = gnunet-service-transport | 147 | BINARY = gnunet-service-transport |
158 | NEIGHBOUR_LIMIT = 50 | 148 | NEIGHBOUR_LIMIT = 50 |
159 | ACCEPT_FROM = 127.0.0.1; | 149 | ACCEPT_FROM = 127.0.0.1; |
@@ -205,7 +195,6 @@ AUTOSTART = NO | |||
205 | PORT = 20060 | 195 | PORT = 20060 |
206 | HOSTNAME = localhost | 196 | HOSTNAME = localhost |
207 | HOME = $SERVICEHOME | 197 | HOME = $SERVICEHOME |
208 | CONFIG = $DEFAULTCONFIG | ||
209 | BINARY = gnunet-service-template | 198 | BINARY = gnunet-service-template |
210 | ACCEPT_FROM = 127.0.0.1; | 199 | ACCEPT_FROM = 127.0.0.1; |
211 | ACCEPT_FROM6 = ::1; | 200 | ACCEPT_FROM6 = ::1; |
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
223 | PORT = 20059 | 212 | PORT = 20059 |
224 | HOSTNAME = localhost | 213 | HOSTNAME = localhost |
225 | HOME = $SERVICEHOME | 214 | HOME = $SERVICEHOME |
226 | CONFIG = $DEFAULTCONFIG | ||
227 | BINARY = gnunet-service-fs | 215 | BINARY = gnunet-service-fs |
228 | ACCEPT_FROM = 127.0.0.1; | 216 | ACCEPT_FROM = 127.0.0.1; |
229 | ACCEPT_FROM6 = ::1; | 217 | ACCEPT_FROM6 = ::1; |
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
238 | EXPECTED_NEIGHBOUR_COUNT = 128 | 226 | EXPECTED_NEIGHBOUR_COUNT = 128 |
239 | 227 | ||
240 | [vpn] | 228 | [vpn] |
241 | CONFIG = $DEFAULTCONFIG | ||
242 | BINARY = gnunet-daemon-vpn | 229 | BINARY = gnunet-daemon-vpn |
243 | IPV6ADDR = 1234::1 | 230 | IPV6ADDR = 1234::1 |
244 | IPV6PREFIX = 32 | 231 | IPV6PREFIX = 32 |
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17 | |||
249 | IFNAME = vpn-gnunet | 236 | IFNAME = vpn-gnunet |
250 | 237 | ||
251 | [exit] | 238 | [exit] |
252 | CONFIG = $DEFAULTCONFIG | ||
253 | BINARY = gnunet-daemon-exit | 239 | BINARY = gnunet-daemon-exit |
254 | IPV6ADDR = 1234:1::1 | 240 | IPV6ADDR = 1234:1::1 |
255 | IPV6PREFIX = 32 | 241 | IPV6PREFIX = 32 |
@@ -264,7 +250,6 @@ AUTOSTART = YES | |||
264 | PORT = 0 | 250 | PORT = 0 |
265 | HOSTNAME = localhost | 251 | HOSTNAME = localhost |
266 | HOME = $SERVICEHOME | 252 | HOME = $SERVICEHOME |
267 | CONFIG = $DEFAULTCONFIG | ||
268 | BINARY = gnunet-service-dns | 253 | BINARY = gnunet-service-dns |
269 | ACCEPT_FROM = 127.0.0.1; | 254 | ACCEPT_FROM = 127.0.0.1; |
270 | ACCEPT_FROM6 = ::1; | 255 | ACCEPT_FROM6 = ::1; |
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO | |||
275 | PORT = 20058 | 260 | PORT = 20058 |
276 | HOSTNAME = localhost | 261 | HOSTNAME = localhost |
277 | HOME = $SERVICEHOME | 262 | HOME = $SERVICEHOME |
278 | CONFIG = $DEFAULTCONFIG | ||
279 | BINARY = gnunet-service-arm | 263 | BINARY = gnunet-service-arm |
280 | ACCEPT_FROM = 127.0.0.1; | 264 | ACCEPT_FROM = 127.0.0.1; |
281 | ACCEPT_FROM6 = ::1; | 265 | ACCEPT_FROM6 = ::1; |
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES | |||
288 | HTTPPORT = 8080 | 272 | HTTPPORT = 8080 |
289 | HOME = $SERVICEHOME | 273 | HOME = $SERVICEHOME |
290 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 274 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
291 | CONFIG = $DEFAULTCONFIG | ||
292 | BINARY = gnunet-daemon-hostlist | 275 | BINARY = gnunet-daemon-hostlist |
293 | OPTIONS = -b | 276 | OPTIONS = -b |
294 | SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ | 277 | SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ |
@@ -299,7 +282,6 @@ AUTOSTART = YES | |||
299 | PORT = 20057 | 282 | PORT = 20057 |
300 | HOSTNAME = localhost | 283 | HOSTNAME = localhost |
301 | HOME = $SERVICEHOME | 284 | HOME = $SERVICEHOME |
302 | CONFIG = $DEFAULTCONFIG | ||
303 | BINARY = gnunet-service-core | 285 | BINARY = gnunet-service-core |
304 | ACCEPT_FROM = 127.0.0.1; | 286 | ACCEPT_FROM = 127.0.0.1; |
305 | ACCEPT_FROM6 = ::1; | 287 | ACCEPT_FROM6 = ::1; |
@@ -333,7 +315,6 @@ AUTOSTART = YES | |||
333 | PORT = 20055 | 315 | PORT = 20055 |
334 | HOSTNAME = localhost | 316 | HOSTNAME = localhost |
335 | HOME = $SERVICEHOME | 317 | HOME = $SERVICEHOME |
336 | CONFIG = $DEFAULTCONFIG | ||
337 | BINARY = gnunet-service-statistics | 318 | BINARY = gnunet-service-statistics |
338 | ACCEPT_FROM = 127.0.0.1; | 319 | ACCEPT_FROM = 127.0.0.1; |
339 | ACCEPT_FROM6 = ::1; | 320 | ACCEPT_FROM6 = ::1; |
@@ -346,7 +327,6 @@ AUTOSTART = YES | |||
346 | PORT = 20054 | 327 | PORT = 20054 |
347 | HOSTNAME = localhost | 328 | HOSTNAME = localhost |
348 | HOME = $SERVICEHOME | 329 | HOME = $SERVICEHOME |
349 | CONFIG = $DEFAULTCONFIG | ||
350 | BINARY = gnunet-service-dht | 330 | BINARY = gnunet-service-dht |
351 | ACCEPT_FROM = 127.0.0.1; | 331 | ACCEPT_FROM = 127.0.0.1; |
352 | ACCEPT_FROM6 = ::1; | 332 | ACCEPT_FROM6 = ::1; |
@@ -367,4 +347,4 @@ UNIX_MATCH_GID = YES | |||
367 | 347 | ||
368 | [dhtcache] | 348 | [dhtcache] |
369 | DATABASE = sqlite | 349 | DATABASE = sqlite |
370 | QUOTA = 1 MB \ No newline at end of file | 350 | QUOTA = 1 MB |
diff --git a/src/lockmanager/lockmanager.conf.in b/src/lockmanager/lockmanager.conf.in index 75b9244dc..42d574324 100644 --- a/src/lockmanager/lockmanager.conf.in +++ b/src/lockmanager/lockmanager.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = YES | |||
3 | @UNIXONLY@ PORT = 2100 | 3 | @UNIXONLY@ PORT = 2100 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-lockmanager | 6 | BINARY = gnunet-service-lockmanager |
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/lockmanager/test_lockmanager_api.conf b/src/lockmanager/test_lockmanager_api.conf index 894f40908..af0d99319 100644 --- a/src/lockmanager/test_lockmanager_api.conf +++ b/src/lockmanager/test_lockmanager_api.conf | |||
@@ -63,7 +63,6 @@ PEERGROUP_TIMEOUT = 2400 s | |||
63 | HOSTKEY = $SERVICEHOME/.hostkey | 63 | HOSTKEY = $SERVICEHOME/.hostkey |
64 | 64 | ||
65 | [PATHS] | 65 | [PATHS] |
66 | DEFAULTCONFIG = test_lockmanager_api.conf | ||
67 | SERVICEHOME = /tmp/test-lockmanager/ | 66 | SERVICEHOME = /tmp/test-lockmanager/ |
68 | 67 | ||
69 | [dns] | 68 | [dns] |
diff --git a/src/mesh/mesh.conf.in b/src/mesh/mesh.conf.in index 83b45c786..fd3fced12 100644 --- a/src/mesh/mesh.conf.in +++ b/src/mesh/mesh.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = YES | |||
3 | @UNIXONLY@ PORT = 2096 | 3 | @UNIXONLY@ PORT = 2096 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-mesh | 6 | BINARY = gnunet-service-mesh |
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/mesh/test_mesh.conf b/src/mesh/test_mesh.conf index e3fd00037..d8bdd7a13 100644 --- a/src/mesh/test_mesh.conf +++ b/src/mesh/test_mesh.conf | |||
@@ -72,7 +72,6 @@ WEAKRANDOM = YES | |||
72 | HOSTKEY = $SERVICEHOME/.hostkey | 72 | HOSTKEY = $SERVICEHOME/.hostkey |
73 | 73 | ||
74 | [PATHS] | 74 | [PATHS] |
75 | DEFAULTCONFIG = test_mesh.conf | ||
76 | SERVICEHOME = /tmp/test-mesh/ | 75 | SERVICEHOME = /tmp/test-mesh/ |
77 | 76 | ||
78 | [dns] | 77 | [dns] |
diff --git a/src/mesh/test_mesh_2dtorus.conf b/src/mesh/test_mesh_2dtorus.conf index 0d15ea509..b6291fff5 100644 --- a/src/mesh/test_mesh_2dtorus.conf +++ b/src/mesh/test_mesh_2dtorus.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test_mesh_small/ | 2 | SERVICEHOME = /tmp/test_mesh_small/ |
3 | DEFAULTCONFIG = test_mesh_small.conf | ||
4 | 3 | ||
5 | [arm] | 4 | [arm] |
6 | PORT = 10010 | 5 | PORT = 10010 |
diff --git a/src/mesh/test_mesh_path.conf b/src/mesh/test_mesh_path.conf index 82bb3e02a..5ac9710d4 100644 --- a/src/mesh/test_mesh_path.conf +++ b/src/mesh/test_mesh_path.conf | |||
@@ -69,7 +69,6 @@ WEAKRANDOM = YES | |||
69 | HOSTKEY = $SERVICEHOME/.hostkey | 69 | HOSTKEY = $SERVICEHOME/.hostkey |
70 | 70 | ||
71 | [PATHS] | 71 | [PATHS] |
72 | DEFAULTCONFIG = test_mesh.conf | ||
73 | SERVICEHOME = /tmp/test-mesh/ | 72 | SERVICEHOME = /tmp/test-mesh/ |
74 | 73 | ||
75 | [dns] | 74 | [dns] |
diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf index 8c0a5f88e..2277a9a76 100644 --- a/src/mesh/test_mesh_small.conf +++ b/src/mesh/test_mesh_small.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test_mesh_small/ | 2 | SERVICEHOME = /tmp/test_mesh_small/ |
3 | DEFAULTCONFIG = test_mesh_small.conf | ||
4 | 3 | ||
5 | [mesh] | 4 | [mesh] |
6 | PORT = 10005 | 5 | PORT = 10005 |
diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in index 6f7129734..d7c372d80 100644 --- a/src/namestore/namestore.conf.in +++ b/src/namestore/namestore.conf.in | |||
@@ -6,7 +6,6 @@ UNIX_MATCH_GID = YES | |||
6 | @UNIXONLY@ PORT = 2099 | 6 | @UNIXONLY@ PORT = 2099 |
7 | HOSTNAME = localhost | 7 | HOSTNAME = localhost |
8 | HOME = $SERVICEHOME | 8 | HOME = $SERVICEHOME |
9 | CONFIG = $DEFAULTCONFIG | ||
10 | BINARY = gnunet-service-namestore | 9 | BINARY = gnunet-service-namestore |
11 | ACCEPT_FROM = 127.0.0.1; | 10 | ACCEPT_FROM = 127.0.0.1; |
12 | ACCEPT_FROM6 = ::1; | 11 | ACCEPT_FROM6 = ::1; |
diff --git a/src/namestore/test_namestore_api.conf b/src/namestore/test_namestore_api.conf index bcbbca91a..565805921 100644 --- a/src/namestore/test_namestore_api.conf +++ b/src/namestore/test_namestore_api.conf | |||
@@ -12,7 +12,6 @@ UNIX_MATCH_GID = YES | |||
12 | PORT = 2099 | 12 | PORT = 2099 |
13 | HOSTNAME = localhost | 13 | HOSTNAME = localhost |
14 | HOME = $SERVICEHOME | 14 | HOME = $SERVICEHOME |
15 | CONFIG = $DEFAULTCONFIG | ||
16 | BINARY = gnunet-service-namestore | 15 | BINARY = gnunet-service-namestore |
17 | ACCEPT_FROM = 127.0.0.1; | 16 | ACCEPT_FROM = 127.0.0.1; |
18 | ACCEPT_FROM6 = ::1; | 17 | ACCEPT_FROM6 = ::1; |
diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf index 7ad00a03c..b3bab0451 100644 --- a/src/nat/test_nat_data.conf +++ b/src/nat/test_nat_data.conf | |||
@@ -1,8 +1,6 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/nat-test | 2 | SERVICEHOME = /tmp/nat-test |
3 | # SERVICEHOME = /var/lib/gnunet/ | 3 | # SERVICEHOME = /var/lib/gnunet/ |
4 | # DEFAULTCONFIG = /etc/gnunet.conf | ||
5 | # If 'DEFAULTCONFIG' is not defined, the current | ||
6 | # configuration file is assumed to be the default, | 4 | # configuration file is assumed to be the default, |
7 | # which is what we want by default... | 5 | # which is what we want by default... |
8 | 6 | ||
@@ -51,7 +49,6 @@ DISABLEV6 = NO | |||
51 | PORT = 2087 | 49 | PORT = 2087 |
52 | HOSTNAME = localhost | 50 | HOSTNAME = localhost |
53 | HOME = $SERVICEHOME | 51 | HOME = $SERVICEHOME |
54 | CONFIG = $DEFAULTCONFIG | ||
55 | BINARY = gnunet-service-arm | 52 | BINARY = gnunet-service-arm |
56 | ACCEPT_FROM = 127.0.0.1; | 53 | ACCEPT_FROM = 127.0.0.1; |
57 | ACCEPT_FROM6 = ::1; | 54 | ACCEPT_FROM6 = ::1; |
@@ -75,7 +72,6 @@ AUTOSTART = YES | |||
75 | PORT = 2088 | 72 | PORT = 2088 |
76 | HOSTNAME = localhost | 73 | HOSTNAME = localhost |
77 | HOME = $SERVICEHOME | 74 | HOME = $SERVICEHOME |
78 | CONFIG = $DEFAULTCONFIG | ||
79 | BINARY = gnunet-service-statistics | 75 | BINARY = gnunet-service-statistics |
80 | ACCEPT_FROM = 127.0.0.1; | 76 | ACCEPT_FROM = 127.0.0.1; |
81 | ACCEPT_FROM6 = ::1; | 77 | ACCEPT_FROM6 = ::1; |
@@ -97,7 +93,6 @@ AUTOSTART = YES | |||
97 | PORT = 2089 | 93 | PORT = 2089 |
98 | HOSTNAME = localhost | 94 | HOSTNAME = localhost |
99 | HOME = $SERVICEHOME | 95 | HOME = $SERVICEHOME |
100 | CONFIG = $DEFAULTCONFIG | ||
101 | BINARY = gnunet-service-resolver | 96 | BINARY = gnunet-service-resolver |
102 | ACCEPT_FROM = 127.0.0.1; | 97 | ACCEPT_FROM = 127.0.0.1; |
103 | ACCEPT_FROM6 = ::1; | 98 | ACCEPT_FROM6 = ::1; |
diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf index 1128b37ea..b30240c57 100644 --- a/src/nat/test_nat_test_data.conf +++ b/src/nat/test_nat_test_data.conf | |||
@@ -1,8 +1,6 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/nat-test | 2 | SERVICEHOME = /tmp/nat-test |
3 | # SERVICEHOME = /var/lib/gnunet/ | 3 | # SERVICEHOME = /var/lib/gnunet/ |
4 | # DEFAULTCONFIG = /etc/gnunet.conf | ||
5 | # If 'DEFAULTCONFIG' is not defined, the current | ||
6 | # configuration file is assumed to be the default, | 4 | # configuration file is assumed to be the default, |
7 | # which is what we want by default... | 5 | # which is what we want by default... |
8 | 6 | ||
diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in index bc49e051d..84f1f6c22 100644 --- a/src/nse/nse.conf.in +++ b/src/nse/nse.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = YES | |||
3 | @JAVAPORT@PORT = 2097 | 3 | @JAVAPORT@PORT = 2097 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-nse | 6 | BINARY = gnunet-service-nse |
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/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf index 49f749fda..b4709dd38 100644 --- a/src/nse/nse_profiler_test.conf +++ b/src/nse/nse_profiler_test.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/nse-profiler/ | 2 | SERVICEHOME = /tmp/nse-profiler/ |
3 | DEFAULTCONFIG = nse_profiler_test.conf | ||
4 | 3 | ||
5 | [nse] | 4 | [nse] |
6 | PORT = 0 | 5 | PORT = 0 |
@@ -10,7 +9,6 @@ BINARY = gnunet-service-nse | |||
10 | #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p | 9 | #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p |
11 | AUTOSTART = NO | 10 | AUTOSTART = NO |
12 | DEBUG = YES | 11 | DEBUG = YES |
13 | CONFIG = $DEFAULTCONFIG | ||
14 | # Overriding network settings for faster testing (do NOT use | 12 | # Overriding network settings for faster testing (do NOT use |
15 | # these values in production just because they are here) | 13 | # these values in production just because they are here) |
16 | WORKDELAY = 60 s | 14 | WORKDELAY = 60 s |
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf index 66075d792..625d059ee 100644 --- a/src/nse/test_nse.conf +++ b/src/nse/test_nse.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-nse-multipeer/ | 2 | SERVICEHOME = /tmp/test-nse-multipeer/ |
3 | DEFAULTCONFIG = test_nse.conf | ||
4 | 3 | ||
5 | [nse] | 4 | [nse] |
6 | PORT = 22353 | 5 | PORT = 22353 |
@@ -10,7 +9,6 @@ BINARY = gnunet-service-nse | |||
10 | #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p | 9 | #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p |
11 | AUTOSTART = YES | 10 | AUTOSTART = YES |
12 | DEBUG = NO | 11 | DEBUG = NO |
13 | CONFIG = $DEFAULTCONFIG | ||
14 | PROOFFILE = $SERVICEHOME/proof.nse | 12 | PROOFFILE = $SERVICEHOME/proof.nse |
15 | # Overriding network settings for faster testing (do NOT use | 13 | # Overriding network settings for faster testing (do NOT use |
16 | # these values in production just because they are here) | 14 | # these values in production just because they are here) |
diff --git a/src/peerinfo/peerinfo.conf.in b/src/peerinfo/peerinfo.conf.in index c45a05262..6bf766d28 100644 --- a/src/peerinfo/peerinfo.conf.in +++ b/src/peerinfo/peerinfo.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = YES | |||
3 | @JAVAPORT@PORT = 2090 | 3 | @JAVAPORT@PORT = 2090 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-peerinfo | 6 | BINARY = gnunet-service-peerinfo |
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/pt/pt.conf b/src/pt/pt.conf index 39c1fb60c..a1eea3305 100644 --- a/src/pt/pt.conf +++ b/src/pt/pt.conf | |||
@@ -1,5 +1,4 @@ | |||
1 | [pt] | 1 | [pt] |
2 | CONFIG = $DEFAULTCONFIG | ||
3 | BINARY = gnunet-daemon-pt | 2 | BINARY = gnunet-daemon-pt |
4 | 3 | ||
5 | # Set this to YES to tunnel IPv4 traffic over GNUnet | 4 | # Set this to YES to tunnel IPv4 traffic over GNUnet |
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf index fa12b98ba..474b55f79 100644 --- a/src/pt/test_gns_vpn.conf +++ b/src/pt/test_gns_vpn.conf | |||
@@ -47,7 +47,7 @@ TTL = 3600000 | |||
47 | 47 | ||
48 | [gns] | 48 | [gns] |
49 | AUTOSTART = YES | 49 | AUTOSTART = YES |
50 | ZONEKEY = $SERVICEHOME/hostkey | 50 | ZONEKEY = $SERVICEHOME/.hostkey |
51 | HIJACK_DNS = YES | 51 | HIJACK_DNS = YES |
52 | 52 | ||
53 | [namestore] | 53 | [namestore] |
diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf index bdac1a5b6..ae9488e8e 100644 --- a/src/pt/test_gnunet_vpn.conf +++ b/src/pt/test_gnunet_vpn.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-vpn/ | 2 | SERVICEHOME = /tmp/gnunet-test-vpn/ |
3 | DEFAULTCONFIG = test_gnunet_vpn.conf | ||
4 | 3 | ||
5 | [transport] | 4 | [transport] |
6 | PLUGINS = tcp | 5 | PLUGINS = tcp |
diff --git a/src/regex/test_regex_big.conf b/src/regex/test_regex_big.conf index f24bc8b5d..f21a2ba57 100644 --- a/src/regex/test_regex_big.conf +++ b/src/regex/test_regex_big.conf | |||
@@ -72,7 +72,6 @@ PEERGROUP_TIMEOUT = 2400 s | |||
72 | HOSTKEY = $SERVICEHOME/.hostkey | 72 | HOSTKEY = $SERVICEHOME/.hostkey |
73 | 73 | ||
74 | [PATHS] | 74 | [PATHS] |
75 | DEFAULTCONFIG = test_stream_local.conf | ||
76 | SERVICEHOME = /tmp/test-stream/ | 75 | SERVICEHOME = /tmp/test-stream/ |
77 | 76 | ||
78 | [dns] | 77 | [dns] |
diff --git a/src/statistics/statistics.conf.in b/src/statistics/statistics.conf.in index 5de9dedea..669e89bd7 100644 --- a/src/statistics/statistics.conf.in +++ b/src/statistics/statistics.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = YES | |||
3 | @JAVAPORT@PORT = 2088 | 3 | @JAVAPORT@PORT = 2088 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-statistics | 6 | BINARY = gnunet-service-statistics |
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/statistics/test_statistics_api_data.conf b/src/statistics/test_statistics_api_data.conf index 4e229e930..c52ff35b3 100644 --- a/src/statistics/test_statistics_api_data.conf +++ b/src/statistics/test_statistics_api_data.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunetd-statistics/ | 2 | SERVICEHOME = /tmp/test-gnunetd-statistics/ |
3 | DEFAULTCONFIG = test_statistics_api_data.conf | ||
4 | 3 | ||
5 | [statistics] | 4 | [statistics] |
6 | PORT = 22353 | 5 | PORT = 22353 |
diff --git a/src/stream/test_stream_local.conf b/src/stream/test_stream_local.conf index df4e49398..b718c01ee 100644 --- a/src/stream/test_stream_local.conf +++ b/src/stream/test_stream_local.conf | |||
@@ -73,7 +73,6 @@ PEERGROUP_TIMEOUT = 2400 s | |||
73 | HOSTKEY = $SERVICEHOME/.hostkey | 73 | HOSTKEY = $SERVICEHOME/.hostkey |
74 | 74 | ||
75 | [PATHS] | 75 | [PATHS] |
76 | DEFAULTCONFIG = test_stream_local.conf | ||
77 | SERVICEHOME = /tmp/test-stream/ | 76 | SERVICEHOME = /tmp/test-stream/ |
78 | 77 | ||
79 | [dns] | 78 | [dns] |
diff --git a/src/template/template.conf b/src/template/template.conf index 522721fb6..439bbd2e6 100644 --- a/src/template/template.conf +++ b/src/template/template.conf | |||
@@ -3,7 +3,6 @@ AUTOSTART = NO | |||
3 | PORT = 9999 | 3 | PORT = 9999 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-template | 6 | BINARY = gnunet-service-template |
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/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf index 9fdb9bcda..2fdefcc1f 100644 --- a/src/testbed/test_testbed_api.conf +++ b/src/testbed/test_testbed_api.conf | |||
@@ -62,7 +62,6 @@ PEERGROUP_TIMEOUT = 2400 s | |||
62 | HOSTKEY = $SERVICEHOME/.hostkey | 62 | HOSTKEY = $SERVICEHOME/.hostkey |
63 | 63 | ||
64 | [PATHS] | 64 | [PATHS] |
65 | DEFAULTCONFIG = test_testbed_api.conf | ||
66 | SERVICEHOME = /tmp/test-testbed/ | 65 | SERVICEHOME = /tmp/test-testbed/ |
67 | 66 | ||
68 | [dns] | 67 | [dns] |
diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in index 5f5585c04..ccd9c4f79 100644 --- a/src/testbed/testbed.conf.in +++ b/src/testbed/testbed.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = NO | |||
3 | @UNIXONLY@ PORT = 2101 | 3 | @UNIXONLY@ PORT = 2101 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-testbed | 6 | BINARY = gnunet-service-testbed |
8 | ACCEPT_FROM = 127.0.0.1; | 7 | ACCEPT_FROM = 127.0.0.1; |
9 | ACCEPT_FROM6 = ::1; | 8 | ACCEPT_FROM6 = ::1; |
@@ -12,4 +11,4 @@ UNIX_MATCH_UID = YES | |||
12 | UNIX_MATCH_GID = YES | 11 | UNIX_MATCH_GID = YES |
13 | MAX_PARALLEL_OPERATIONS = 1000 | 12 | MAX_PARALLEL_OPERATIONS = 1000 |
14 | MAX_PARALLEL_SERVICE_CONNECTIONS = 1000 | 13 | MAX_PARALLEL_SERVICE_CONNECTIONS = 1000 |
15 | MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5 \ No newline at end of file | 14 | MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5 |
diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf index 80049ba4c..411c3ecb5 100644 --- a/src/testing/test_testing_defaults.conf +++ b/src/testing/test_testing_defaults.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-testing/ | 2 | SERVICEHOME = /tmp/test-gnunet-testing/ |
3 | DEFAULTCONFIG = test_testing_defaults.conf | ||
4 | 3 | ||
5 | [resolver] | 4 | [resolver] |
6 | PORT = 2564 | 5 | PORT = 2564 |
diff --git a/src/testing_old/test_testing_2dtorus.conf b/src/testing_old/test_testing_2dtorus.conf index 69c59567d..4ec3db83e 100644 --- a/src/testing_old/test_testing_2dtorus.conf +++ b/src/testing_old/test_testing_2dtorus.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_testing_2dtorus/ | 3 | SERVICEHOME = /tmp/test_testing_2dtorus/ |
4 | DEFAULTCONFIG = test_testing_2dtorus.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 10010 | 6 | PORT = 10010 |
diff --git a/src/testing_old/test_testing_connect_peer1.conf b/src/testing_old/test_testing_connect_peer1.conf index cccda5e2a..3349990c5 100644 --- a/src/testing_old/test_testing_connect_peer1.conf +++ b/src/testing_old/test_testing_connect_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-testing-connect-peer1/ | 3 | SERVICEHOME = /tmp/test-gnunet-testing-connect-peer1/ |
4 | DEFAULTCONFIG = test_testing_connect_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12568 | 6 | PORT = 12568 |
diff --git a/src/testing_old/test_testing_connect_peer2.conf b/src/testing_old/test_testing_connect_peer2.conf index 08ec55113..fb1f19c8e 100644 --- a/src/testing_old/test_testing_connect_peer2.conf +++ b/src/testing_old/test_testing_connect_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunet-testing-connect-peer2/ | 3 | SERVICEHOME = /tmp/test-gnunet-testing-connect-peer2/ |
4 | DEFAULTCONFIG = test_testing_connect_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 22568 | 6 | PORT = 22568 |
diff --git a/src/testing_old/test_testing_data.conf b/src/testing_old/test_testing_data.conf index c46cb0d42..8bccc3e8d 100644 --- a/src/testing_old/test_testing_data.conf +++ b/src/testing_old/test_testing_data.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data.conf | ||
4 | 3 | ||
5 | [arm] | 4 | [arm] |
6 | DEFAULTSERVICES = core | 5 | DEFAULTSERVICES = core |
diff --git a/src/testing_old/test_testing_data_remote.conf b/src/testing_old/test_testing_data_remote.conf index 477baad7e..3c7389afc 100644 --- a/src/testing_old/test_testing_data_remote.conf +++ b/src/testing_old/test_testing_data_remote.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_remote.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | CONTROL_HOST = 127.0.0.1 | 5 | CONTROL_HOST = 127.0.0.1 |
diff --git a/src/testing_old/test_testing_data_topology_2d_torus.conf b/src/testing_old/test_testing_data_topology_2d_torus.conf index 62fff6925..6a890e95b 100644 --- a/src/testing_old/test_testing_data_topology_2d_torus.conf +++ b/src/testing_old/test_testing_data_topology_2d_torus.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_2d_torus.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | NUM_PEERS = 13 | 5 | NUM_PEERS = 13 |
diff --git a/src/testing_old/test_testing_data_topology_blacklist.conf b/src/testing_old/test_testing_data_topology_blacklist.conf index 28e61301a..d60d9d77a 100644 --- a/src/testing_old/test_testing_data_topology_blacklist.conf +++ b/src/testing_old/test_testing_data_topology_blacklist.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_blacklist.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | NUM_PEERS = 4 | 5 | NUM_PEERS = 4 |
diff --git a/src/testing_old/test_testing_data_topology_churn.conf b/src/testing_old/test_testing_data_topology_churn.conf index ae46bf0e6..53a261f2b 100644 --- a/src/testing_old/test_testing_data_topology_churn.conf +++ b/src/testing_old/test_testing_data_topology_churn.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_churn.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | NUM_PEERS = 12 | 5 | NUM_PEERS = 12 |
diff --git a/src/testing_old/test_testing_data_topology_clique.conf b/src/testing_old/test_testing_data_topology_clique.conf index c71a4b6c2..8ef25c78e 100644 --- a/src/testing_old/test_testing_data_topology_clique.conf +++ b/src/testing_old/test_testing_data_topology_clique.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_clique.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | CONNECT_TIMEOUT = 180 s | 5 | CONNECT_TIMEOUT = 180 s |
diff --git a/src/testing_old/test_testing_data_topology_clique_dfs.conf b/src/testing_old/test_testing_data_topology_clique_dfs.conf index 349c398ed..8fc926320 100644 --- a/src/testing_old/test_testing_data_topology_clique_dfs.conf +++ b/src/testing_old/test_testing_data_topology_clique_dfs.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_clique.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | NUM_PEERS = 7 | 5 | NUM_PEERS = 7 |
diff --git a/src/testing_old/test_testing_data_topology_clique_minimum.conf b/src/testing_old/test_testing_data_topology_clique_minimum.conf index 8d8206d33..88de2aef1 100644 --- a/src/testing_old/test_testing_data_topology_clique_minimum.conf +++ b/src/testing_old/test_testing_data_topology_clique_minimum.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_clique.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | NUM_PEERS = 20 | 5 | NUM_PEERS = 20 |
diff --git a/src/testing_old/test_testing_data_topology_clique_random.conf b/src/testing_old/test_testing_data_topology_clique_random.conf index d76175291..a88ddccbc 100644 --- a/src/testing_old/test_testing_data_topology_clique_random.conf +++ b/src/testing_old/test_testing_data_topology_clique_random.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_clique.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | NUM_PEERS = 20 | 5 | NUM_PEERS = 20 |
diff --git a/src/testing_old/test_testing_data_topology_erdos_renyi.conf b/src/testing_old/test_testing_data_topology_erdos_renyi.conf index ece17e505..e8a5883b2 100644 --- a/src/testing_old/test_testing_data_topology_erdos_renyi.conf +++ b/src/testing_old/test_testing_data_topology_erdos_renyi.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_clique.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | TOPOLOGY = ERDOS_RENYI | 5 | TOPOLOGY = ERDOS_RENYI |
diff --git a/src/testing_old/test_testing_data_topology_internat.conf b/src/testing_old/test_testing_data_topology_internat.conf index 14475ce55..2a0da4ac2 100644 --- a/src/testing_old/test_testing_data_topology_internat.conf +++ b/src/testing_old/test_testing_data_topology_internat.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_clique.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | TOPOLOGY = INTERNAT | 5 | TOPOLOGY = INTERNAT |
diff --git a/src/testing_old/test_testing_data_topology_none.conf b/src/testing_old/test_testing_data_topology_none.conf index 38e658680..e0ffe5244 100644 --- a/src/testing_old/test_testing_data_topology_none.conf +++ b/src/testing_old/test_testing_data_topology_none.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_clique.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | NUM_PEERS = 1000 | 5 | NUM_PEERS = 1000 |
diff --git a/src/testing_old/test_testing_data_topology_ring.conf b/src/testing_old/test_testing_data_topology_ring.conf index 5320ae068..4720d6ddd 100644 --- a/src/testing_old/test_testing_data_topology_ring.conf +++ b/src/testing_old/test_testing_data_topology_ring.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_clique.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | TOPOLOGY = RING | 5 | TOPOLOGY = RING |
diff --git a/src/testing_old/test_testing_data_topology_scale_free.conf b/src/testing_old/test_testing_data_topology_scale_free.conf index ae7233588..06a8095f0 100644 --- a/src/testing_old/test_testing_data_topology_scale_free.conf +++ b/src/testing_old/test_testing_data_topology_scale_free.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_scale_free.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | NUM_PEERS = 50 | 5 | NUM_PEERS = 50 |
diff --git a/src/testing_old/test_testing_data_topology_small_world_ring.conf b/src/testing_old/test_testing_data_topology_small_world_ring.conf index 10e398fa0..dc4f0991a 100644 --- a/src/testing_old/test_testing_data_topology_small_world_ring.conf +++ b/src/testing_old/test_testing_data_topology_small_world_ring.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_clique.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | NUM_PEERS = 25 | 5 | NUM_PEERS = 25 |
diff --git a/src/testing_old/test_testing_data_topology_small_world_torus.conf b/src/testing_old/test_testing_data_topology_small_world_torus.conf index d5a58b760..cfc2f76d2 100644 --- a/src/testing_old/test_testing_data_topology_small_world_torus.conf +++ b/src/testing_old/test_testing_data_topology_small_world_torus.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_clique.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | TOPOLOGY = SMALL_WORLD | 5 | TOPOLOGY = SMALL_WORLD |
diff --git a/src/testing_old/test_testing_data_topology_stability.conf b/src/testing_old/test_testing_data_topology_stability.conf index 389c0aa25..aa2cf2cfa 100644 --- a/src/testing_old/test_testing_data_topology_stability.conf +++ b/src/testing_old/test_testing_data_topology_stability.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_data_topology_clique.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | SETTLE_TIME = 600 s | 5 | SETTLE_TIME = 600 s |
diff --git a/src/testing_old/test_testing_defaults.conf b/src/testing_old/test_testing_defaults.conf index a28baa7be..dac98aac3 100644 --- a/src/testing_old/test_testing_defaults.conf +++ b/src/testing_old/test_testing_defaults.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-testing/ | 2 | SERVICEHOME = /tmp/test-gnunet-testing/ |
3 | DEFAULTCONFIG = test_testing_defaults.conf | ||
4 | 3 | ||
5 | [resolver] | 4 | [resolver] |
6 | PORT = 2564 | 5 | PORT = 2564 |
diff --git a/src/testing_old/test_testing_peergroup_data.conf b/src/testing_old/test_testing_peergroup_data.conf index 880cebf86..f642627a1 100644 --- a/src/testing_old/test_testing_peergroup_data.conf +++ b/src/testing_old/test_testing_peergroup_data.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_testing_defaults.conf | 1 | @INLINE@ test_testing_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_testing_peergroup_data.conf | ||
4 | 3 | ||
5 | [TESTING_old] | 4 | [TESTING_old] |
6 | CONNECT_ATTEMPTS = 2 | 5 | CONNECT_ATTEMPTS = 2 |
diff --git a/src/topology/topology.conf b/src/topology/topology.conf index 39f29219d..15723ee0d 100644 --- a/src/topology/topology.conf +++ b/src/topology/topology.conf | |||
@@ -4,7 +4,6 @@ FRIENDS-ONLY = NO | |||
4 | AUTOCONNECT = YES | 4 | AUTOCONNECT = YES |
5 | TARGET-CONNECTION-COUNT = 16 | 5 | TARGET-CONNECTION-COUNT = 16 |
6 | FRIENDS = $SERVICEHOME/friends | 6 | FRIENDS = $SERVICEHOME/friends |
7 | CONFIG = $DEFAULTCONFIG | ||
8 | BINARY = gnunet-daemon-topology | 7 | BINARY = gnunet-daemon-topology |
9 | 8 | ||
10 | 9 | ||
diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf index ab0c5b391..05309d53c 100644 --- a/src/transport/template_cfg_peer1.conf +++ b/src/transport/template_cfg_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = template_cfg_peer1.conf | ||
5 | 4 | ||
6 | [gnunetd] | 5 | [gnunetd] |
7 | HOSTKEY = $SERVICEHOME/.hostkey | 6 | HOSTKEY = $SERVICEHOME/.hostkey |
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf index a10dfc488..210ee51c5 100644 --- a/src/transport/template_cfg_peer2.conf +++ b/src/transport/template_cfg_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = template_cfg_peer2.conf | ||
5 | 4 | ||
6 | [gnunetd] | 5 | [gnunetd] |
7 | HOSTKEY = $SERVICEHOME/.hostkey | 6 | HOSTKEY = $SERVICEHOME/.hostkey |
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf index fdf9fb3b4..189238c08 100644 --- a/src/transport/test_plugin_transport_data.conf +++ b/src/transport/test_plugin_transport_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ | 3 | SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ |
4 | DEFAULTCONFIG = test_plugin_transport_data.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 2400 | 6 | PORT = 2400 |
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf index 93f75dd0b..b0fb0e059 100644 --- a/src/transport/test_quota_compliance_data.conf +++ b/src/transport/test_quota_compliance_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ | 3 | SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ |
4 | DEFAULTCONFIG = test_quota_compliance_data.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 2368 | 6 | PORT = 2368 |
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf index 472e3f74b..885bcba3d 100644 --- a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 |
4 | DEFAULTCONFIG = test_quota_compliance_http_asymmetric_peer1.conf | ||
5 | 4 | ||
6 | [transport-http_client] | 5 | [transport-http_client] |
7 | 6 | ||
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf index 48c1a6e83..33f8be543 100644 --- a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_http_asymmetric_peer2.conf | ||
5 | 4 | ||
6 | [transport-http_server] | 5 | [transport-http_server] |
7 | PORT = 3010 | 6 | PORT = 3010 |
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf index 9f3fa97ad..885bcba3d 100644 --- a/src/transport/test_quota_compliance_http_peer1.conf +++ b/src/transport/test_quota_compliance_http_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 |
4 | DEFAULTCONFIG = test_quota_compliance_http_peer1.conf | ||
5 | 4 | ||
6 | [transport-http_client] | 5 | [transport-http_client] |
7 | 6 | ||
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf index 5dd356d96..33f8be543 100644 --- a/src/transport/test_quota_compliance_http_peer2.conf +++ b/src/transport/test_quota_compliance_http_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_http_peer2.conf | ||
5 | 4 | ||
6 | [transport-http_server] | 5 | [transport-http_server] |
7 | PORT = 3010 | 6 | PORT = 3010 |
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf index 092762781..271bbe056 100644 --- a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ |
4 | DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer1.conf | ||
5 | 4 | ||
6 | [transport-https_client] | 5 | [transport-https_client] |
7 | 6 | ||
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf index 6646a582c..8e07ff337 100644 --- a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer2.conf | ||
5 | 4 | ||
6 | [transport-https_server] | 5 | [transport-https_server] |
7 | PORT = 3001 | 6 | PORT = 3001 |
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf index a23b2ad01..271bbe056 100644 --- a/src/transport/test_quota_compliance_https_peer1.conf +++ b/src/transport/test_quota_compliance_https_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ |
4 | DEFAULTCONFIG = test_quota_compliance_https_peer1.conf | ||
5 | 4 | ||
6 | [transport-https_client] | 5 | [transport-https_client] |
7 | 6 | ||
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf index 490b97983..8e07ff337 100644 --- a/src/transport/test_quota_compliance_https_peer2.conf +++ b/src/transport/test_quota_compliance_https_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_https_peer2.conf | ||
5 | 4 | ||
6 | [transport-https_server] | 5 | [transport-https_server] |
7 | PORT = 3001 | 6 | PORT = 3001 |
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf index 8a1dad5ac..b7eb28757 100644 --- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ |
4 | DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 4094 | 6 | PORT = 4094 |
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf index bbfa8ec28..cc949df30 100644 --- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p2/ |
4 | DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf index 29e56fe9b..b7eb28757 100644 --- a/src/transport/test_quota_compliance_tcp_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ |
4 | DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 4094 | 6 | PORT = 4094 |
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf index 5da60d03b..67f171ec9 100644 --- a/src/transport/test_quota_compliance_tcp_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf index fceee7bcd..0d49d4ef8 100644 --- a/src/transport/test_quota_compliance_udp_peer1.conf +++ b/src/transport/test_quota_compliance_udp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ |
4 | DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 4368 | 6 | PORT = 4368 |
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf index 4b58c934f..3c57fe5d6 100644 --- a/src/transport/test_quota_compliance_udp_peer2.conf +++ b/src/transport/test_quota_compliance_udp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 3368 | 6 | PORT = 3368 |
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf index 649cf1c63..1e4afcebc 100644 --- a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ |
4 | DEFAULTCONFIG = test_quota_compliance_unix_asymmetric_peer1.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 4087 | 6 | PORT = 4087 |
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf index a2d1bdd18..f732e98ae 100644 --- a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_unix_asymmetric_peer2.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 3087 | 6 | PORT = 3087 |
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf index 60e656bad..bde78468c 100644 --- a/src/transport/test_quota_compliance_unix_peer1.conf +++ b/src/transport/test_quota_compliance_unix_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ |
4 | DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf | ||
5 | 4 | ||
6 | [transport-unix] | 5 | [transport-unix] |
7 | PORT = 12120 | 6 | PORT = 12120 |
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf index b4f0b648a..0b803ccbc 100644 --- a/src/transport/test_quota_compliance_unix_peer2.conf +++ b/src/transport/test_quota_compliance_unix_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf | ||
5 | 4 | ||
6 | [transport-unix] | 5 | [transport-unix] |
7 | PORT = 12136 | 6 | PORT = 12136 |
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf index 9dd9d1bd6..e81a3f9f1 100644 --- a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | TESTMODE = 1 | 6 | TESTMODE = 1 |
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf index bc868d7d7..bd5387667 100644 --- a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_quota_compliance_wlan_peer1.conf b/src/transport/test_quota_compliance_wlan_peer1.conf index 9dd9d1bd6..e81a3f9f1 100644 --- a/src/transport/test_quota_compliance_wlan_peer1.conf +++ b/src/transport/test_quota_compliance_wlan_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | TESTMODE = 1 | 6 | TESTMODE = 1 |
diff --git a/src/transport/test_quota_compliance_wlan_peer2.conf b/src/transport/test_quota_compliance_wlan_peer2.conf index bc868d7d7..bd5387667 100644 --- a/src/transport/test_quota_compliance_wlan_peer2.conf +++ b/src/transport/test_quota_compliance_wlan_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer1.conf b/src/transport/test_transport_api_bidirectional_connect_peer1.conf index 49fc66243..614d89d21 100644 --- a/src/transport/test_transport_api_bidirectional_connect_peer1.conf +++ b/src/transport/test_transport_api_bidirectional_connect_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_bidirectional_connect_peer1.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12000 | 6 | PORT = 12000 |
@@ -43,4 +42,4 @@ TIMEOUT = 5 s | |||
43 | 42 | ||
44 | [transport-https] | 43 | [transport-https] |
45 | PORT = 12009 | 44 | PORT = 12009 |
46 | TIMEOUT = 5 s \ No newline at end of file | 45 | TIMEOUT = 5 s |
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer2.conf b/src/transport/test_transport_api_bidirectional_connect_peer2.conf index 2d64351d1..4aeee7c7d 100644 --- a/src/transport/test_transport_api_bidirectional_connect_peer2.conf +++ b/src/transport/test_transport_api_bidirectional_connect_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_bidirectional_connect_peer2.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12010 | 6 | PORT = 12010 |
@@ -42,4 +41,4 @@ TIMEOUT = 5 s | |||
42 | 41 | ||
43 | [transport-https] | 42 | [transport-https] |
44 | PORT = 12019 | 43 | PORT = 12019 |
45 | TIMEOUT = 5 s \ No newline at end of file | 44 | TIMEOUT = 5 s |
diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf index 39552462a..164a38f69 100644 --- a/src/transport/test_transport_api_data.conf +++ b/src/transport/test_transport_api_data.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_transport_api_data.conf | ||
4 | 3 | ||
5 | [transport-tcp] | 4 | [transport-tcp] |
6 | PORT = 2094 | 5 | PORT = 2094 |
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf index ebb4fd469..6879d0534 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf index fe6d19b5c..67f171ec9 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index 4af712a43..e0b60e37f 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
4 | DEFAULTCONFIG = test_transport_api_http_peer1.conf | ||
5 | 4 | ||
6 | [transport-http_client] | 5 | [transport-http_client] |
7 | 6 | ||
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index 62126b07d..4e4c22e30 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
4 | DEFAULTCONFIG = test_transport_api_http_peer2.conf | ||
5 | 4 | ||
6 | [transport-http_server] | 5 | [transport-http_server] |
7 | PORT = 12090 | 6 | PORT = 12090 |
diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf index bef99cdac..c38c36a18 100644 --- a/src/transport/test_transport_api_http_reverse_peer1.conf +++ b/src/transport/test_transport_api_http_reverse_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | INLINE@ template_cfg_peer1.conf | 1 | INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
4 | DEFAULTCONFIG = test_transport_api_http_reverse_peer1.conf | ||
5 | 4 | ||
6 | 5 | ||
7 | [transport-http_client] | 6 | [transport-http_client] |
diff --git a/src/transport/test_transport_api_http_reverse_peer2.conf b/src/transport/test_transport_api_http_reverse_peer2.conf index c7e9d4fe1..b73921f94 100644 --- a/src/transport/test_transport_api_http_reverse_peer2.conf +++ b/src/transport/test_transport_api_http_reverse_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | INLINE@ template_cfg_peer2.conf | 1 | INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
4 | DEFAULTCONFIG = test_transport_api_http_reverse_peer2.conf | ||
5 | 4 | ||
6 | 5 | ||
7 | [transport-http_client] | 6 | [transport-http_client] |
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf index b387e5a10..78d3ca0a4 100644 --- a/src/transport/test_transport_api_https_peer1.conf +++ b/src/transport/test_transport_api_https_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ |
4 | DEFAULTCONFIG = test_transport_api_https_peer1.conf | ||
5 | 4 | ||
6 | [transport-https_client] | 5 | [transport-https_client] |
7 | PORT = 12100 | 6 | PORT = 12100 |
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf index f825c5889..a347887bb 100644 --- a/src/transport/test_transport_api_https_peer2.conf +++ b/src/transport/test_transport_api_https_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ |
4 | DEFAULTCONFIG = test_transport_api_https_peer2.conf | ||
5 | 4 | ||
6 | [transport-https_server] | 5 | [transport-https_server] |
7 | PORT = 12110 | 6 | PORT = 12110 |
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf index d29b9465a..dceeccb9f 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf index 3c0e49674..caaddded2 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 0 | 6 | PORT = 0 |
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf index 9fb57ab37..61b0f5644 100644 --- a/src/transport/test_transport_api_multi_peer1.conf +++ b/src/transport/test_transport_api_multi_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-multi-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-multi-p1/ |
4 | DEFAULTCONFIG = test_transport_api_multi_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12140 | 6 | PORT = 12140 |
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf index 18e2a5be6..c660c3c41 100644 --- a/src/transport/test_transport_api_multi_peer2.conf +++ b/src/transport/test_transport_api_multi_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-multi-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-multi-p2/ |
4 | DEFAULTCONFIG = test_transport_api_multi_peer2.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | ALLOW_NAT = NO | 6 | ALLOW_NAT = NO |
diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf index f178b855a..9e39e3e41 100644 --- a/src/transport/test_transport_api_reliability_http_peer1.conf +++ b/src/transport/test_transport_api_reliability_http_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_http_peer1.conf | ||
5 | 4 | ||
6 | [transport-http_client] | 5 | [transport-http_client] |
7 | 6 | ||
diff --git a/src/transport/test_transport_api_reliability_http_peer2.conf b/src/transport/test_transport_api_reliability_http_peer2.conf index b2d1b338c..3174e3d00 100644 --- a/src/transport/test_transport_api_reliability_http_peer2.conf +++ b/src/transport/test_transport_api_reliability_http_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_http_peer2.conf | ||
5 | 4 | ||
6 | [transport-http_server] | 5 | [transport-http_server] |
7 | PORT = 12090 | 6 | PORT = 12090 |
diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf index 4a2c0b5a6..d5e88261a 100644 --- a/src/transport/test_transport_api_reliability_https_peer1.conf +++ b/src/transport/test_transport_api_reliability_https_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_https_peer1.conf | ||
5 | 4 | ||
6 | [transport-https_client] | 5 | [transport-https_client] |
7 | 6 | ||
diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf index 5a21188da..5cc0d245a 100644 --- a/src/transport/test_transport_api_reliability_https_peer2.conf +++ b/src/transport/test_transport_api_reliability_https_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_https_peer2.conf | ||
5 | 4 | ||
6 | [transport-https_server] | 5 | [transport-https_server] |
7 | PORT = 12310 | 6 | PORT = 12310 |
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf index ffd3d2f7b..9490d405c 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | BEHIND_NAT = YES | 6 | BEHIND_NAT = YES |
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf index c6020ff09..b59916b7f 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | DISABLEV6 = YES | 6 | DISABLEV6 = YES |
diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf index 3be982dd9..5f1d693a8 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf index 62575a971..3cb42c0b6 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_api_reliability_wlan_peer1.conf b/src/transport/test_transport_api_reliability_wlan_peer1.conf index 9dd9d1bd6..e81a3f9f1 100644 --- a/src/transport/test_transport_api_reliability_wlan_peer1.conf +++ b/src/transport/test_transport_api_reliability_wlan_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | TESTMODE = 1 | 6 | TESTMODE = 1 |
diff --git a/src/transport/test_transport_api_reliability_wlan_peer2.conf b/src/transport/test_transport_api_reliability_wlan_peer2.conf index bc868d7d7..bd5387667 100644 --- a/src/transport/test_transport_api_reliability_wlan_peer2.conf +++ b/src/transport/test_transport_api_reliability_wlan_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf index 73f36f3c2..4ebf5b3be 100644 --- a/src/transport/test_transport_api_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_tcp_nat_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | BEHIND_NAT = YES | 6 | BEHIND_NAT = YES |
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf index 0bf50fd4b..1ef51c9c9 100644 --- a/src/transport/test_transport_api_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_tcp_nat_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | DISABLEV6 = YES | 6 | DISABLEV6 = YES |
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index 9532b730a..54abfa5ba 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index fe6d19b5c..67f171ec9 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf index cdfbdd9af..2eb23662a 100644 --- a/src/transport/test_transport_api_timeout_http_peer1.conf +++ b/src/transport/test_transport_api_timeout_http_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
4 | DEFAULTCONFIG = test_transport_api_timeout_http_peer1.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | 6 | ||
diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf index 6edc9e24a..0aa77a9b9 100644 --- a/src/transport/test_transport_api_timeout_http_peer2.conf +++ b/src/transport/test_transport_api_timeout_http_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
4 | DEFAULTCONFIG = test_transport_api_timeout_http_peer2.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | 6 | ||
diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf index c8a26d2af..ff1ef47bd 100644 --- a/src/transport/test_transport_api_timeout_https_peer1.conf +++ b/src/transport/test_transport_api_timeout_https_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ |
4 | DEFAULTCONFIG = test_transport_api_timeout_https_peer1.conf | ||
5 | 4 | ||
6 | [transport-https_client] | 5 | [transport-https_client] |
7 | 6 | ||
diff --git a/src/transport/test_transport_api_timeout_https_peer2.conf b/src/transport/test_transport_api_timeout_https_peer2.conf index 3daf94bb1..35fba0a83 100644 --- a/src/transport/test_transport_api_timeout_https_peer2.conf +++ b/src/transport/test_transport_api_timeout_https_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ |
4 | DEFAULTCONFIG = test_transport_api_timeout_https_peer2.conf | ||
5 | 4 | ||
6 | [transport-https_server] | 5 | [transport-https_server] |
7 | PORT = 12110 | 6 | PORT = 12110 |
diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf index ecb599f2a..dceeccb9f 100644 --- a/src/transport/test_transport_api_timeout_tcp_peer1.conf +++ b/src/transport/test_transport_api_timeout_tcp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_timeout_tcp_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_timeout_tcp_peer2.conf b/src/transport/test_transport_api_timeout_tcp_peer2.conf index ba2e27e57..f89c3a3f7 100644 --- a/src/transport/test_transport_api_timeout_tcp_peer2.conf +++ b/src/transport/test_transport_api_timeout_tcp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_timeout_tcp_peer2.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | ALLOW_NAT = NO | 6 | ALLOW_NAT = NO |
diff --git a/src/transport/test_transport_api_timeout_udp_peer1.conf b/src/transport/test_transport_api_timeout_udp_peer1.conf index a1216e4aa..7c3e33ad0 100644 --- a/src/transport/test_transport_api_timeout_udp_peer1.conf +++ b/src/transport/test_transport_api_timeout_udp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_udp_peer1.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12040 | 6 | PORT = 12040 |
diff --git a/src/transport/test_transport_api_timeout_udp_peer2.conf b/src/transport/test_transport_api_timeout_udp_peer2.conf index 3e487a6bf..9b79c3b54 100644 --- a/src/transport/test_transport_api_timeout_udp_peer2.conf +++ b/src/transport/test_transport_api_timeout_udp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_udp_peer2.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12050 | 6 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_timeout_unix_peer1.conf b/src/transport/test_transport_api_timeout_unix_peer1.conf index b1ace7d4c..5d0235f73 100644 --- a/src/transport/test_transport_api_timeout_unix_peer1.conf +++ b/src/transport/test_transport_api_timeout_unix_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ |
4 | DEFAULTCONFIG = test_transport_api_unix_peer1.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12125 | 6 | PORT = 12125 |
diff --git a/src/transport/test_transport_api_timeout_unix_peer2.conf b/src/transport/test_transport_api_timeout_unix_peer2.conf index a15358844..255c7e246 100644 --- a/src/transport/test_transport_api_timeout_unix_peer2.conf +++ b/src/transport/test_transport_api_timeout_unix_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ |
4 | DEFAULTCONFIG = test_transport_api_unix_peer2.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12135 | 6 | PORT = 12135 |
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf index 16a4e6279..6e643d5af 100644 --- a/src/transport/test_transport_api_udp_nat_peer1.conf +++ b/src/transport/test_transport_api_udp_nat_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/ |
4 | DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | BEHIND_NAT = YES | 6 | BEHIND_NAT = YES |
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf index 0852b25d9..1c1258ad1 100644 --- a/src/transport/test_transport_api_udp_nat_peer2.conf +++ b/src/transport/test_transport_api_udp_nat_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/ |
4 | DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | ALLOW_NAT = YES | 6 | ALLOW_NAT = YES |
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index a1216e4aa..7c3e33ad0 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_udp_peer1.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12040 | 6 | PORT = 12040 |
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index 3e487a6bf..9b79c3b54 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_udp_peer2.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12050 | 6 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf index b1ace7d4c..5d0235f73 100644 --- a/src/transport/test_transport_api_unix_peer1.conf +++ b/src/transport/test_transport_api_unix_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ |
4 | DEFAULTCONFIG = test_transport_api_unix_peer1.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12125 | 6 | PORT = 12125 |
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf index a15358844..255c7e246 100644 --- a/src/transport/test_transport_api_unix_peer2.conf +++ b/src/transport/test_transport_api_unix_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ |
4 | DEFAULTCONFIG = test_transport_api_unix_peer2.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12135 | 6 | PORT = 12135 |
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf index d872f02e7..a4fd104ed 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer1.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12040 | 6 | PORT = 12040 |
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf index 50ee65acb..755e65dce 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer2.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12050 | 6 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_unreliability_udp_peer1.conf b/src/transport/test_transport_api_unreliability_udp_peer1.conf index 8a5a4052e..b9669bf65 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_udp_peer1.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12040 | 6 | PORT = 12040 |
diff --git a/src/transport/test_transport_api_unreliability_udp_peer2.conf b/src/transport/test_transport_api_unreliability_udp_peer2.conf index d240c42ce..46ad0177d 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_udp_peer2.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12050 | 6 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_unreliability_unix_peer1.conf b/src/transport/test_transport_api_unreliability_unix_peer1.conf index 8689e415e..5d0235f73 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer1.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_unix_peer1.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12125 | 6 | PORT = 12125 |
diff --git a/src/transport/test_transport_api_unreliability_unix_peer2.conf b/src/transport/test_transport_api_unreliability_unix_peer2.conf index 7c3cc1953..c9dab48d7 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer2.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_unix_peer2.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12135 | 6 | PORT = 12135 |
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf b/src/transport/test_transport_api_unreliability_wlan_peer1.conf index 9dd9d1bd6..e81a3f9f1 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer1.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | TESTMODE = 1 | 6 | TESTMODE = 1 |
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer2.conf b/src/transport/test_transport_api_unreliability_wlan_peer2.conf index bc868d7d7..bd5387667 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer2.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf index e379cf08c..ff37415a4 100644 --- a/src/transport/test_transport_api_wlan_peer1.conf +++ b/src/transport/test_transport_api_wlan_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | INTERFACE = mon0 | 6 | INTERFACE = mon0 |
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf index 3e0ce27d6..87a6036fb 100644 --- a/src/transport/test_transport_api_wlan_peer2.conf +++ b/src/transport/test_transport_api_wlan_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf index 0939a7976..4551bb138 100644 --- a/src/transport/test_transport_defaults.conf +++ b/src/transport/test_transport_defaults.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-transport-api/ | 2 | SERVICEHOME = /tmp/test-transport-api/ |
3 | DEFAULTCONFIG = test_transport_defaults.conf | ||
4 | 3 | ||
5 | [transport-tcp] | 4 | [transport-tcp] |
6 | TIMEOUT = 300 s | 5 | TIMEOUT = 300 s |
diff --git a/src/transport/test_transport_startonly.conf b/src/transport/test_transport_startonly.conf index 255df4c44..8e161382b 100644 --- a/src/transport/test_transport_startonly.conf +++ b/src/transport/test_transport_startonly.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_transport_api_data.conf | ||
4 | 3 | ||
5 | [arm] | 4 | [arm] |
6 | DEFAULTSERVICES = transport | 5 | DEFAULTSERVICES = transport |
diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in index c6c752d8a..46cb9bf17 100644 --- a/src/transport/transport.conf.in +++ b/src/transport/transport.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = YES | |||
3 | @UNIXONLY@ PORT = 2091 | 3 | @UNIXONLY@ PORT = 2091 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-transport | 6 | BINARY = gnunet-service-transport |
8 | #PREFIX = valgrind | 7 | #PREFIX = valgrind |
9 | NEIGHBOUR_LIMIT = 50 | 8 | NEIGHBOUR_LIMIT = 50 |
diff --git a/src/util/resolver.conf.in b/src/util/resolver.conf.in index 7abe1c998..cccb60c2f 100644 --- a/src/util/resolver.conf.in +++ b/src/util/resolver.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = YES | |||
3 | @JAVAPORT@PORT = 2089 | 3 | @JAVAPORT@PORT = 2089 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-resolver | 6 | BINARY = gnunet-service-resolver |
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/util/util.conf b/src/util/util.conf index f3d301e48..1390a866a 100644 --- a/src/util/util.conf +++ b/src/util/util.conf | |||
@@ -1,8 +1,6 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = ~/.gnunet/ | 2 | SERVICEHOME = ~/.gnunet/ |
3 | # SERVICEHOME = /var/lib/gnunet/ | 3 | # SERVICEHOME = /var/lib/gnunet/ |
4 | # DEFAULTCONFIG = /etc/gnunet.conf | ||
5 | # If 'DEFAULTCONFIG' is not defined, the current | ||
6 | # configuration file is assumed to be the default, | 4 | # configuration file is assumed to be the default, |
7 | # which is what we want by default... | 5 | # which is what we want by default... |
8 | 6 | ||
diff --git a/src/vpn/vpn.conf.in b/src/vpn/vpn.conf.in index f5eb22447..9080bb439 100644 --- a/src/vpn/vpn.conf.in +++ b/src/vpn/vpn.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = YES | |||
3 | @UNIXONLY@ PORT = 0 | 3 | @UNIXONLY@ PORT = 0 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-vpn | 6 | BINARY = gnunet-service-vpn |
8 | ACCEPT_FROM = 127.0.0.1; | 7 | ACCEPT_FROM = 127.0.0.1; |
9 | ACCEPT_FROM6 = ::1; | 8 | ACCEPT_FROM6 = ::1; |