aboutsummaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
authorgrothoff <grothoff@140774ce-b5e7-0310-ab8b-a85725594a96>2012-10-09 18:38:01 +0000
committergrothoff <grothoff@140774ce-b5e7-0310-ab8b-a85725594a96>2012-10-09 18:38:01 +0000
commite26321da7cab838bc8521faad3ac0b73cdfcd016 (patch)
treedafeebf08b90707d2cbfb6f5ab75c361ba298d6e /src/fs
parent148d1668c50df1b3af31c70167d9ea8721934896 (diff)
-getting rid of silly, stupid, useless, often wrong DEFAULTCONFIG setting
git-svn-id: https://gnunet.org/svn/gnunet@24237 140774ce-b5e7-0310-ab8b-a85725594a96
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/fs.conf.in2
-rw-r--r--src/fs/test_fs_data.conf1
-rw-r--r--src/fs/test_fs_defaults.conf1
-rw-r--r--src/fs/test_fs_download_data.conf1
-rw-r--r--src/fs/test_fs_file_information_data.conf1
-rw-r--r--src/fs/test_fs_list_indexed_data.conf1
-rw-r--r--src/fs/test_fs_namespace_data.conf1
-rw-r--r--src/fs/test_fs_publish_data.conf1
-rw-r--r--src/fs/test_fs_search_data.conf1
-rw-r--r--src/fs/test_fs_unindex_data.conf1
-rw-r--r--src/fs/test_gnunet_fs_idx_data.conf1
-rw-r--r--src/fs/test_gnunet_fs_ns_data.conf1
-rw-r--r--src/fs/test_gnunet_fs_psd_data.conf1
-rw-r--r--src/fs/test_gnunet_fs_rec_data.conf1
-rw-r--r--src/fs/test_gnunet_service_fs_migration_data.conf1
15 files changed, 0 insertions, 16 deletions
diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index 6c4d8217dc..cac59e5cb5 100644
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -8,7 +8,6 @@ UPDATE_DIR = $SERVICEHOME/fs/updates/
@UNIXONLY@ PORT = 2094
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -34,7 +33,6 @@ PREFIX = @MONKEYPREFIX@
[gnunet-auto-share]
BINARY = gnunet-auto-share
-CONFIG = $DEFAULTCONFIG
# Note: MUST specify path to auto-share directory and CAN specify other options
# to gnunet-auto-share here!
diff --git a/src/fs/test_fs_data.conf b/src/fs/test_fs_data.conf
index f2b4e1ee7e..40e85ad4cc 100644
--- a/src/fs/test_fs_data.conf
+++ b/src/fs/test_fs_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-data/
-DEFAULTCONFIG = test_fs_data.conf
[fs]
ACTIVEMIGRATION = NO
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index e0e697ec71..d1c4d8292f 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-lib/
-DEFAULTCONFIG = fs_test_lib_data.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf
index 25aad51194..7955daa4d7 100644
--- a/src/fs/test_fs_download_data.conf
+++ b/src/fs/test_fs_download_data.conf
@@ -1,5 +1,4 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-download/
-DEFAULTCONFIG = test_fs_download_data.conf
diff --git a/src/fs/test_fs_file_information_data.conf b/src/fs/test_fs_file_information_data.conf
index 09cedf8998..ea43807b18 100644
--- a/src/fs/test_fs_file_information_data.conf
+++ b/src/fs/test_fs_file_information_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-file-information/
-DEFAULTCONFIG = test_fs_file_information_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/fs/test_fs_list_indexed_data.conf
index 704ba4d663..99d4466803 100644
--- a/src/fs/test_fs_list_indexed_data.conf
+++ b/src/fs/test_fs_list_indexed_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/
-DEFAULTCONFIG = test_fs_list_indexed_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_fs_namespace_data.conf b/src/fs/test_fs_namespace_data.conf
index 3cdd241d7d..625eb2d512 100644
--- a/src/fs/test_fs_namespace_data.conf
+++ b/src/fs/test_fs_namespace_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-namespace/
-DEFAULTCONFIG = test_fs_namespace_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_fs_publish_data.conf b/src/fs/test_fs_publish_data.conf
index 234f2b0efd..14e69197b7 100644
--- a/src/fs/test_fs_publish_data.conf
+++ b/src/fs/test_fs_publish_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-publish/
-DEFAULTCONFIG = test_fs_publish_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_fs_search_data.conf b/src/fs/test_fs_search_data.conf
index ea5e4c5e35..812a7bfe28 100644
--- a/src/fs/test_fs_search_data.conf
+++ b/src/fs/test_fs_search_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-search/
-DEFAULTCONFIG = test_fs_search_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_fs_unindex_data.conf b/src/fs/test_fs_unindex_data.conf
index 977d6e7596..fa28fbbbde 100644
--- a/src/fs/test_fs_unindex_data.conf
+++ b/src/fs/test_fs_unindex_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-unindex/
-DEFAULTCONFIG = test_fs_unindex_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_gnunet_fs_idx_data.conf b/src/fs/test_gnunet_fs_idx_data.conf
index f852011a87..4394805e50 100644
--- a/src/fs/test_gnunet_fs_idx_data.conf
+++ b/src/fs/test_gnunet_fs_idx_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-py-idx/
-DEFAULTCONFIG = test_gnunet_fs_idx_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_gnunet_fs_ns_data.conf b/src/fs/test_gnunet_fs_ns_data.conf
index 5f297abfad..57e3432e16 100644
--- a/src/fs/test_gnunet_fs_ns_data.conf
+++ b/src/fs/test_gnunet_fs_ns_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-py-ns/
-DEFAULTCONFIG = test_gnunet_fs_ns_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_gnunet_fs_psd_data.conf b/src/fs/test_gnunet_fs_psd_data.conf
index b68c6b58e0..e41f6bfe3c 100644
--- a/src/fs/test_gnunet_fs_psd_data.conf
+++ b/src/fs/test_gnunet_fs_psd_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-py-psd/
-DEFAULTCONFIG = test_gnunet_fs_psd_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_gnunet_fs_rec_data.conf b/src/fs/test_gnunet_fs_rec_data.conf
index dae8b19a88..fcdcda96d7 100644
--- a/src/fs/test_gnunet_fs_rec_data.conf
+++ b/src/fs/test_gnunet_fs_rec_data.conf
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-py-rec/
-DEFAULTCONFIG = test_gnunet_fs_rec_data.conf
[transport]
PLUGINS =
diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf b/src/fs/test_gnunet_service_fs_migration_data.conf
index 9c05a88e90..cd14c3261f 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 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-service-fs-migration/
-DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf
[ats]