diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-10 17:11:06 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-10 17:11:06 +0000 |
commit | b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a (patch) | |
tree | be6defbdf18e3af9bdcc979cf27b253fe0b4d5f9 /src/fs | |
parent | 3871fc32bbd05da817d94f4188023a4edebc367a (diff) | |
download | gnunet-b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a.tar.gz gnunet-b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a.zip |
moving away from DEFAULTSERVICES to per-section FORCESTART, thus addressing #3565 indirectly
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/fs.conf.in | 2 | ||||
-rw-r--r-- | src/fs/test_fs_defaults.conf | 1 | ||||
-rw-r--r-- | src/fs/test_fs_uri_data.conf | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in index dcd121587..ca0191e36 100644 --- a/src/fs/fs.conf.in +++ b/src/fs/fs.conf.in | |||
@@ -1,5 +1,6 @@ | |||
1 | [fs] | 1 | [fs] |
2 | AUTOSTART = @AUTOSTART@ | 2 | AUTOSTART = @AUTOSTART@ |
3 | FORCESTART = YES | ||
3 | INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst | 4 | INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst |
4 | RESPECT = $GNUNET_DATA_HOME/fs/credit/ | 5 | RESPECT = $GNUNET_DATA_HOME/fs/credit/ |
5 | STATE_DIR = $GNUNET_DATA_HOME/fs/persistence/ | 6 | STATE_DIR = $GNUNET_DATA_HOME/fs/persistence/ |
@@ -60,6 +61,7 @@ MAX_CADET_CLIENTS = 128 | |||
60 | 61 | ||
61 | [gnunet-auto-share] | 62 | [gnunet-auto-share] |
62 | BINARY = gnunet-auto-share | 63 | BINARY = gnunet-auto-share |
64 | FORCESTART = NO | ||
63 | 65 | ||
64 | # Note: MUST specify path to auto-share directory and CAN specify other options | 66 | # Note: MUST specify path to auto-share directory and CAN specify other options |
65 | # to gnunet-auto-share here! | 67 | # to gnunet-auto-share here! |
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf index b57e51ed0..97d8e6f87 100644 --- a/src/fs/test_fs_defaults.conf +++ b/src/fs/test_fs_defaults.conf | |||
@@ -22,7 +22,6 @@ RETURN_LOCAL_ADDRESSES = YES | |||
22 | [arm] | 22 | [arm] |
23 | PORT = 4366 | 23 | PORT = 4366 |
24 | HOSTNAME = localhost | 24 | HOSTNAME = localhost |
25 | DEFAULTSERVICES = fs | ||
26 | 25 | ||
27 | [datastore] | 26 | [datastore] |
28 | QUOTA = 100 MB | 27 | QUOTA = 100 MB |
diff --git a/src/fs/test_fs_uri_data.conf b/src/fs/test_fs_uri_data.conf index 5355fbc85..fcf6f42d4 100644 --- a/src/fs/test_fs_uri_data.conf +++ b/src/fs/test_fs_uri_data.conf | |||
@@ -2,6 +2,4 @@ | |||
2 | [PATHS] | 2 | [PATHS] |
3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-uri/ | 3 | GNUNET_TEST_HOME = /tmp/gnunet-test-fs-uri/ |
4 | 4 | ||
5 | [arm] | ||
6 | DEFAULTSERVICES = topology hostlist | ||
7 | 5 | ||