diff options
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/fs.conf.in | 2 | ||||
-rw-r--r-- | src/fs/test_fs_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_fs_defaults.conf | 1 | ||||
-rw-r--r-- | src/fs/test_fs_download_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_fs_file_information_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_fs_list_indexed_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_fs_namespace_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_fs_publish_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_fs_search_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_fs_unindex_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_gnunet_fs_idx_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_gnunet_fs_ns_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_gnunet_fs_psd_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_gnunet_fs_rec_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_gnunet_service_fs_migration_data.conf | 1 |
15 files changed, 0 insertions, 16 deletions
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] |