diff options
author | xrs <xrs@mail36.net> | 2018-06-23 16:58:42 +0200 |
---|---|---|
committer | xrs <xrs@mail36.net> | 2018-06-23 16:58:42 +0200 |
commit | 99c6e18e63181d8759ecbb398d58019a55d3ce6f (patch) | |
tree | cf925bf99a6fbe60dbec8ead7248bc59a0c8cce6 /src/nse | |
parent | b993ca621717d0a9958b4138a32fb1e3cef7f54c (diff) | |
parent | c293f84ea192f361baf720a3979589c0e0881abc (diff) | |
download | gnunet-99c6e18e63181d8759ecbb398d58019a55d3ce6f.tar.gz gnunet-99c6e18e63181d8759ecbb398d58019a55d3ce6f.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src/nse')
-rw-r--r-- | src/nse/nse.conf.in | 2 | ||||
-rw-r--r-- | src/nse/nse_infiniband.conf | 2 | ||||
-rw-r--r-- | src/nse/nse_profiler_test.conf | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in index e8d7bd2ea..7b234451c 100644 --- a/src/nse/nse.conf.in +++ b/src/nse/nse.conf.in | |||
@@ -1,5 +1,5 @@ | |||
1 | [nse] | 1 | [nse] |
2 | AUTOSTART = @AUTOSTART@ | 2 | START_ON_DEMAND = @START_ON_DEMAND@ |
3 | FORCESTART = YES | 3 | FORCESTART = YES |
4 | @JAVAPORT@PORT = 2097 | 4 | @JAVAPORT@PORT = 2097 |
5 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf index 9904ca711..816427bac 100644 --- a/src/nse/nse_infiniband.conf +++ b/src/nse/nse_infiniband.conf | |||
@@ -2,7 +2,7 @@ | |||
2 | GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/ | 2 | GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/ |
3 | 3 | ||
4 | [testbed] | 4 | [testbed] |
5 | AUTOSTART = NO | 5 | START_ON_DEMAND = NO |
6 | ORT = 12113 | 6 | ORT = 12113 |
7 | ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 192.168.0.0/16; | 7 | ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 192.168.0.0/16; |
8 | HOSTNAME = localhost | 8 | HOSTNAME = localhost |
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf index ad5da536b..4f55fe4a1 100644 --- a/src/nse/nse_profiler_test.conf +++ b/src/nse/nse_profiler_test.conf | |||
@@ -2,7 +2,7 @@ | |||
2 | GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/ | 2 | GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/ |
3 | 3 | ||
4 | [testbed] | 4 | [testbed] |
5 | AUTOSTART = NO | 5 | START_ON_DEMAND = NO |
6 | PORT = 12113 | 6 | PORT = 12113 |
7 | ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; | 7 | ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; |
8 | HOSTNAME = localhost | 8 | HOSTNAME = localhost |
@@ -13,7 +13,7 @@ OPERATION_TIMEOUT = 45 s | |||
13 | 13 | ||
14 | [nse] | 14 | [nse] |
15 | FORCESTART = YES | 15 | FORCESTART = YES |
16 | AUTOSTART = NO | 16 | START_ON_DEMAND = NO |
17 | # Overriding network settings for faster testing (do NOT use | 17 | # Overriding network settings for faster testing (do NOT use |
18 | # these values in production just because they are here) | 18 | # these values in production just because they are here) |
19 | WORKDELAY = 60 s | 19 | WORKDELAY = 60 s |