[GNUnet-SVN] r16276 - gnunet/src/fs

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16276 - gnunet/src/fs

From:	gnunet
Subject:	[GNUnet-SVN] r16276 - gnunet/src/fs
Date:	Mon, 1 Aug 2011 15:16:23 +0200
Author: grothoff
Date: 2011-08-01 15:16:23 +0200 (Mon, 01 Aug 2011)
New Revision: 16276

Added:
   gnunet/src/fs/test_fs_defaults.conf
Modified:
   gnunet/src/fs/Makefile.am
   gnunet/src/fs/fs_test_lib_data.conf
   gnunet/src/fs/test_fs_data.conf
   gnunet/src/fs/test_fs_download_data.conf
   gnunet/src/fs/test_fs_file_information_data.conf
   gnunet/src/fs/test_fs_list_indexed_data.conf
   gnunet/src/fs/test_fs_namespace_data.conf
   gnunet/src/fs/test_fs_publish_data.conf
   gnunet/src/fs/test_fs_search_data.conf
   gnunet/src/fs/test_fs_unindex_data.conf
   gnunet/src/fs/test_fs_uri_data.conf
   gnunet/src/fs/test_gnunet_fs_idx_data.conf
   gnunet/src/fs/test_gnunet_fs_ns_data.conf
   gnunet/src/fs/test_gnunet_fs_psd_data.conf
   gnunet/src/fs/test_gnunet_fs_rec_data.conf
   gnunet/src/fs/test_gnunet_service_fs_migration_data.conf
Log:
simplifying configs with includes

Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am   2011-08-01 13:16:14 UTC (rev 16275)
+++ gnunet/src/fs/Makefile.am   2011-08-01 13:16:23 UTC (rev 16276)
@@ -388,6 +388,7 @@
 
 
 EXTRA_DIST = \
+  test_fs_defaults.conf \
   fs_test_lib_data.conf \
   test_fs_data.conf \
   test_fs_download_data.conf \

Modified: gnunet/src/fs/fs_test_lib_data.conf
===================================================================
--- gnunet/src/fs/fs_test_lib_data.conf 2011-08-01 13:16:14 UTC (rev 16275)
+++ gnunet/src/fs/fs_test_lib_data.conf 2011-08-01 13:16:23 UTC (rev 16276)
@@ -1,96 +1,11 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-lib/
-DEFAULTCONFIG = fs_test_lib_data.conf
+SERVICEHOME = /tmp/gnunet-fs-test-lib/
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 43464
-HOSTNAME = localhost
-
-[transport]
-PORT = 43465
-PLUGINS = tcp
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-transport
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[arm]
-PORT = 43466
-HOSTNAME = localhost
-DEFAULTSERVICES = fs
-#GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
-
-[datastore]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-QUOTA = 2000000000
-
-[statistics]
-PORT = 43467
-HOSTNAME = localhost
-
-[transport-tcp]
-BINDTO = 127.0.0.1
-PORT = 43468
-
-[peerinfo]
-PORT = 43469
-HOSTNAME = localhost
-
 [core]
-PORT = 43470
-HOSTNAME = localhost
-#TOTAL_QUOTA_IN = 9321
-#TOTAL_QUOTA_OUT = 9321
 TOTAL_QUOTA_IN = 3932160
 TOTAL_QUOTA_OUT = 3932160
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-core
 
-[fs]
-PORT = 43471
-HOSTNAME = localhost
-#OPTIONS = -L DEBUG
-CONTENT_CACHING = NO
-CONTENT_PUSHING = NO
-DELAY = NO
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes 
-#BINARY = /home/grothoff/bin/gnunet-service-fs
-#PREFIX = xterm -e gdb -x cmd --args 
+[datastore]
+QUOTA = 2000000000
 
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-
-[dhtcache]
-QUOTA=65536
-DATABASE=sqlite
-
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/fs/test_fs_data.conf
===================================================================
--- gnunet/src/fs/test_fs_data.conf     2011-08-01 13:16:14 UTC (rev 16275)
+++ gnunet/src/fs/test_fs_data.conf     2011-08-01 13:16:23 UTC (rev 16276)
@@ -1,64 +1,8 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs/
+SERVICEHOME = /tmp/gnunet-test-fs-data/
 DEFAULTCONFIG = test_fs_data.conf
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 42464
-HOSTNAME = localhost
-
-[transport]
-PORT = 42465
-PLUGINS = 
-#DEBUG = YES
-
-[arm]
-PORT = 42466
-HOSTNAME = localhost
-DEFAULTSERVICES =
-
-[datastore]
-#DEBUG = YES
-
-[statistics]
-PORT = 42467
-HOSTNAME = localhost
-
-[peerinfo]
-PORT = 42469
-HOSTNAME = localhost
-
-[core]
-PORT = 42470
-HOSTNAME = localhost
-
 [fs]
-PORT = 42471
-HOSTNAME = localhost
 ACTIVEMIGRATION = NO
-#DEBUG = YES
 
-[testing]
-WEAKRANDOM = YES
-
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Added: gnunet/src/fs/test_fs_defaults.conf
===================================================================
--- gnunet/src/fs/test_fs_defaults.conf                         (rev 0)
+++ gnunet/src/fs/test_fs_defaults.conf 2011-08-01 13:16:23 UTC (rev 16276)
@@ -0,0 +1,73 @@
+[PATHS]
+SERVICEHOME = /tmp/gnunet-test-fs-lib/
+DEFAULTCONFIG = fs_test_lib_data.conf
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+[resolver]
+PORT = 43464
+HOSTNAME = localhost
+
+[transport]
+PORT = 43465
+PLUGINS = tcp
+
+[nat]
+DISABLEV6 = YES
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
+
+[arm]
+PORT = 43466
+HOSTNAME = localhost
+DEFAULTSERVICES = fs
+
+[datastore]
+QUOTA = 100000000
+
+[statistics]
+PORT = 43467
+HOSTNAME = localhost
+
+[transport-tcp]
+BINDTO = 127.0.0.1
+PORT = 43468
+
+[peerinfo]
+PORT = 43469
+HOSTNAME = localhost
+
+[core]
+PORT = 43470
+HOSTNAME = localhost
+TOTAL_QUOTA_IN = 65536
+TOTAL_QUOTA_OUT = 65536
+
+[fs]
+PORT = 43471
+HOSTNAME = localhost
+CONTENT_CACHING = YES
+CONTENT_PUSHING = YES
+DELAY = YES
+
+[testing]
+WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+
+[dhtcache]
+QUOTA=65536
+DATABASE=sqlite
+
+[mesh]
+AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO

Modified: gnunet/src/fs/test_fs_download_data.conf
===================================================================
--- gnunet/src/fs/test_fs_download_data.conf    2011-08-01 13:16:14 UTC (rev 
16275)
+++ gnunet/src/fs/test_fs_download_data.conf    2011-08-01 13:16:23 UTC (rev 
16276)
@@ -1,3 +1,4 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/gnunet-test-fs-download/
 DEFAULTCONFIG = test_fs_download_data.conf
@@ -2,59 +3 @@
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 42464
-HOSTNAME = localhost
-
-[transport]
-PORT = 42465
-PLUGINS = 
-
-[arm]
-PORT = 42466
-HOSTNAME = localhost
-DEFAULTSERVICES = 
-
-[datastore]
-#DEBUG = YES
-
-[statistics]
-PORT = 42467
-HOSTNAME = localhost
-
-[peerinfo]
-PORT = 42469
-HOSTNAME = localhost
-
-[core]
-PORT = 42470
-HOSTNAME = localhost
-
-[fs]
-PORT = 42471
-HOSTNAME = localhost
-CONTENT_CACHING = NO
-CONTENT_PUSHING = NO
-# DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-fs
-
-[testing]
-WEAKRANDOM = YES
-
-
-[dhtcache]
-QUOTA=65536
-DATABASE=sqlite
-
-[mesh]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/fs/test_fs_file_information_data.conf
===================================================================
--- gnunet/src/fs/test_fs_file_information_data.conf    2011-08-01 13:16:14 UTC 
(rev 16275)
+++ gnunet/src/fs/test_fs_file_information_data.conf    2011-08-01 13:16:23 UTC 
(rev 16276)
@@ -1,3 +1,4 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/gnunet-test-fs-file-information/
 DEFAULTCONFIG = test_fs_file_information_data.conf
@@ -2,59 +3,4 @@
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 42464
-HOSTNAME = localhost
-
 [transport]
-PORT = 42465
 PLUGINS = 
 
-[arm]
-PORT = 42466
-HOSTNAME = localhost
-DEFAULTSERVICES = 
-
-[datastore]
-#DEBUG = YES
-
-[statistics]
-PORT = 42467
-HOSTNAME = localhost
-
-[peerinfo]
-PORT = 42469
-HOSTNAME = localhost
-
-[core]
-PORT = 42470
-HOSTNAME = localhost
-
-[fs]
-PORT = 42471
-HOSTNAME = localhost
-#DEBUG = YES
-
-[testing]
-WEAKRANDOM = YES
-
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/fs/test_fs_list_indexed_data.conf
===================================================================
--- gnunet/src/fs/test_fs_list_indexed_data.conf        2011-08-01 13:16:14 UTC 
(rev 16275)
+++ gnunet/src/fs/test_fs_list_indexed_data.conf        2011-08-01 13:16:23 UTC 
(rev 16276)
@@ -1,3 +1,4 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/
 DEFAULTCONFIG = test_fs_list_indexed_data.conf
@@ -2,60 +3,7 @@
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 42464
-HOSTNAME = localhost
-
 [transport]
-PORT = 42465
 PLUGINS = 
 
-[arm]
-PORT = 42466
-HOSTNAME = localhost
-DEFAULTSERVICES =
-
-[datastore]
-#DEBUG = YES
-
-[statistics]
-PORT = 42467
-HOSTNAME = localhost
-
-[peerinfo]
-PORT = 42469
-HOSTNAME = localhost
-
-[core]
-PORT = 42470
-HOSTNAME = localhost
-
 [fs]
-PORT = 42471
-HOSTNAME = localhost
 ACTIVEMIGRATION = NO
-# DEBUG = YES
 
-[testing]
-WEAKRANDOM = YES
-
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/fs/test_fs_namespace_data.conf
===================================================================
--- gnunet/src/fs/test_fs_namespace_data.conf   2011-08-01 13:16:14 UTC (rev 
16275)
+++ gnunet/src/fs/test_fs_namespace_data.conf   2011-08-01 13:16:23 UTC (rev 
16276)
@@ -1,3 +1,4 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/gnunet-test-fs-namespace/
 DEFAULTCONFIG = test_fs_namespace_data.conf
@@ -2,62 +3,4 @@
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 42464
-HOSTNAME = localhost
-
 [transport]
-PORT = 42465
 PLUGINS = 
 
-[arm]
-PORT = 42466
-HOSTNAME = localhost
-DEFAULTSERVICES = 
-
-[datastore]
-# DEBUG = YES
-
-[statistics]
-PORT = 42467
-HOSTNAME = localhost
-
-[peerinfo]
-PORT = 42469
-HOSTNAME = localhost
-
-[core]
-PORT = 42470
-HOSTNAME = localhost
-
-[fs]
-PORT = 42471
-HOSTNAME = localhost
-IDENTITY_DIR = $SERVICEHOME/pseudos/
-# DEBUG = YES
-CONTENT_CACHING = NO
-CONTENT_PUSHING = NO
-
-[testing]
-WEAKRANDOM = YES
-
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/fs/test_fs_publish_data.conf
===================================================================
--- gnunet/src/fs/test_fs_publish_data.conf     2011-08-01 13:16:14 UTC (rev 
16275)
+++ gnunet/src/fs/test_fs_publish_data.conf     2011-08-01 13:16:23 UTC (rev 
16276)
@@ -1,3 +1,4 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/gnunet-test-fs-publish/
 DEFAULTCONFIG = test_fs_publish_data.conf
@@ -2,60 +3,7 @@
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 42464
-HOSTNAME = localhost
-
 [transport]
-PORT = 42465
 PLUGINS = 
 
-[arm]
-PORT = 42466
-HOSTNAME = localhost
-DEFAULTSERVICES = 
-
-[datastore]
-#DEBUG = YES
-
-[statistics]
-PORT = 42467
-HOSTNAME = localhost
-
-[peerinfo]
-PORT = 42469
-HOSTNAME = localhost
-
-[core]
-PORT = 42470
-HOSTNAME = localhost
-
 [fs]
-PORT = 42471
-HOSTNAME = localhost
 ACTIVEMIGRATION = NO
-#DEBUG = YES
 
-[testing]
-WEAKRANDOM = YES
-
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/fs/test_fs_search_data.conf
===================================================================
--- gnunet/src/fs/test_fs_search_data.conf      2011-08-01 13:16:14 UTC (rev 
16275)
+++ gnunet/src/fs/test_fs_search_data.conf      2011-08-01 13:16:23 UTC (rev 
16276)
@@ -1,3 +1,4 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/gnunet-test-fs-search/
 DEFAULTCONFIG = test_fs_search_data.conf
@@ -2,59 +3,4 @@
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 42464
-HOSTNAME = localhost
-
 [transport]
-PORT = 42465
 PLUGINS = 
 
-[arm]
-PORT = 42466
-HOSTNAME = localhost
-DEFAULTSERVICES = 
-
-[datastore]
-# DEBUG = YES
-
-[statistics]
-PORT = 42467
-HOSTNAME = localhost
-
-[peerinfo]
-PORT = 42469
-HOSTNAME = localhost
-
-[core]
-PORT = 42470
-HOSTNAME = localhost
-
-[fs]
-PORT = 42471
-HOSTNAME = localhost
-# DEBUG = YES
-
-[testing]
-WEAKRANDOM = YES
-
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/fs/test_fs_unindex_data.conf
===================================================================
--- gnunet/src/fs/test_fs_unindex_data.conf     2011-08-01 13:16:14 UTC (rev 
16275)
+++ gnunet/src/fs/test_fs_unindex_data.conf     2011-08-01 13:16:23 UTC (rev 
16276)
@@ -1,3 +1,4 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/gnunet-test-fs-unindex/
 DEFAULTCONFIG = test_fs_unindex_data.conf
@@ -2,59 +3,4 @@
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 42464
-HOSTNAME = localhost
-
 [transport]
-PORT = 42465
 PLUGINS = 
 
-[arm]
-PORT = 42466
-HOSTNAME = localhost
-DEFAULTSERVICES = 
-
-[datastore]
-#DEBUG = YES
-
-[statistics]
-PORT = 42467
-HOSTNAME = localhost
-
-[peerinfo]
-PORT = 42469
-HOSTNAME = localhost
-
-[core]
-PORT = 42470
-HOSTNAME = localhost
-
-[fs]
-PORT = 42471
-HOSTNAME = localhost
-#DEBUG = YES
-
-[testing]
-WEAKRANDOM = YES
-
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/fs/test_fs_uri_data.conf
===================================================================
--- gnunet/src/fs/test_fs_uri_data.conf 2011-08-01 13:16:14 UTC (rev 16275)
+++ gnunet/src/fs/test_fs_uri_data.conf 2011-08-01 13:16:23 UTC (rev 16276)
@@ -1,29 +1,7 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/gnunet-test-fs-uri/
-DEFAULTCONFIG = /etc/gnunetd.conf
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+[arm]
+DEFAULTSERVICES = topology hostlist
 
-[TESTING]
-WEAKRANDOM = YES
-
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/fs/test_gnunet_fs_idx_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_fs_idx_data.conf  2011-08-01 13:16:14 UTC (rev 
16275)
+++ gnunet/src/fs/test_gnunet_fs_idx_data.conf  2011-08-01 13:16:23 UTC (rev 
16276)
@@ -1,3 +1,4 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/gnunet-test-fs-py-idx/
 DEFAULTCONFIG = test_gnunet_fs_idx_data.conf
@@ -2,61 +3,4 @@
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 46464
-HOSTNAME = localhost
-
 [transport]
-PORT = 46465
 PLUGINS = 
 
-[arm]
-PORT = 46466
-HOSTNAME = localhost
-DEFAULTSERVICES = 
-
-[datastore]
-# DEBUG = YES
-
-[statistics]
-PORT = 46467
-HOSTNAME = localhost
-
-[peerinfo]
-PORT = 46469
-HOSTNAME = localhost
-
-[core]
-PORT = 46470
-HOSTNAME = localhost
-
-[fs]
-PORT = 46471
-HOSTNAME = localhost
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-fs
-
-[testing]
-WEAKRANDOM = YES
-
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/fs/test_gnunet_fs_ns_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_fs_ns_data.conf   2011-08-01 13:16:14 UTC (rev 
16275)
+++ gnunet/src/fs/test_gnunet_fs_ns_data.conf   2011-08-01 13:16:23 UTC (rev 
16276)
@@ -1,3 +1,4 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/gnunet-test-fs-py-ns/
 DEFAULTCONFIG = test_gnunet_fs_ns_data.conf
@@ -2,61 +3,4 @@
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 47464
-HOSTNAME = localhost
-
 [transport]
-PORT = 47465
 PLUGINS = 
 
-[arm]
-PORT = 47466
-HOSTNAME = localhost
-DEFAULTSERVICES = 
-
-[datastore]
-# DEBUG = YES
-
-[statistics]
-PORT = 47467
-HOSTNAME = localhost
-
-[peerinfo]
-PORT = 47469
-HOSTNAME = localhost
-
-[core]
-PORT = 47470
-HOSTNAME = localhost
-
-[fs]
-PORT = 47471
-HOSTNAME = localhost
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-fs
-
-[testing]
-WEAKRANDOM = YES
-
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/fs/test_gnunet_fs_psd_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_fs_psd_data.conf  2011-08-01 13:16:14 UTC (rev 
16275)
+++ gnunet/src/fs/test_gnunet_fs_psd_data.conf  2011-08-01 13:16:23 UTC (rev 
16276)
@@ -1,3 +1,4 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/gnunet-test-fs-py-psd/
 DEFAULTCONFIG = test_gnunet_fs_psd_data.conf
@@ -2,63 +3,4 @@
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 45464
-HOSTNAME = localhost
-
 [transport]
-PORT = 45465
 PLUGINS = 
 
-[arm]
-PORT = 45466
-HOSTNAME = localhost
-DEFAULTSERVICES = 
-
-[datastore]
-#DEBUG = YES
-
-[statistics]
-PORT = 45467
-HOSTNAME = localhost
-
-[peerinfo]
-PORT = 45469
-HOSTNAME = localhost
-
-[core]
-PORT = 45470
-HOSTNAME = localhost
-
-[fs]
-PORT = 45471
-HOSTNAME = localhost
-#DEBUG = YES
-CONTENT_CACHING = NO
-CONTENT_PUSHING = NO
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-fs
-
-[testing]
-WEAKRANDOM = YES
-
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/fs/test_gnunet_fs_rec_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_fs_rec_data.conf  2011-08-01 13:16:14 UTC (rev 
16275)
+++ gnunet/src/fs/test_gnunet_fs_rec_data.conf  2011-08-01 13:16:23 UTC (rev 
16276)
@@ -1,3 +1,4 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/gnunet-test-fs-py-rec/
 DEFAULTCONFIG = test_gnunet_fs_rec_data.conf
@@ -2,62 +3,4 @@
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 44464
-HOSTNAME = localhost
-
 [transport]
-PORT = 44465
 PLUGINS = 
 
-[arm]
-PORT = 44466
-HOSTNAME = localhost
-DEFAULTSERVICES = 
-
-[datastore]
-PORT = 44472
-# DEBUG = YES
-
-[statistics]
-PORT = 44467
-HOSTNAME = localhost
-
-[peerinfo]
-PORT = 44469
-HOSTNAME = localhost
-
-[core]
-PORT = 44470
-HOSTNAME = localhost
-
-[fs]
-PORT = 44471
-HOSTNAME = localhost
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-fs
-
-[testing]
-WEAKRANDOM = YES
-
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/fs/test_gnunet_service_fs_migration_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_migration_data.conf    2011-08-01 
13:16:14 UTC (rev 16275)
+++ gnunet/src/fs/test_gnunet_service_fs_migration_data.conf    2011-08-01 
13:16:23 UTC (rev 16276)
@@ -1,3 +1,4 @@
address@hidden@ test_fs_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-service-fs-migration/
 DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf
@@ -2,83 +3 @@
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 43464
-HOSTNAME = localhost
-
-[transport]
-PORT = 43465
-PLUGINS = tcp
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[arm]
-PORT = 43466
-HOSTNAME = localhost
-DEFAULTSERVICES = fs
-#OPTIONS = -L DEBUG
-
-[datastore]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-
-[statistics]
-PORT = 43467
-HOSTNAME = localhost
-
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 43468
-
-[peerinfo]
-PORT = 43469
-HOSTNAME = localhost
-
-[core]
-PORT = 43470
-HOSTNAME = localhost
-#TOTAL_QUOTA_IN = 9321
-#TOTAL_QUOTA_OUT = 9321
-TOTAL_QUOTA_IN = 3932160
-TOTAL_QUOTA_OUT = 3932160
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-
-[fs]
-PORT = 43471
-HOSTNAME = localhost
-#OPTIONS = -L DEBUG
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes 
-#PREFIX = xterm -e gdb -x cmd --args 
-
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-[dhtcache]
-QUOTA=65536
-DATABASE=sqlite
-
-[mesh]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r16276 - gnunet/src/fs, gnunet <=
Prev by Date: [GNUnet-SVN] r16275 - gnunet/src/transport
Next by Date: [GNUnet-SVN] r16277 - gnunet/src/util
Previous by thread: [GNUnet-SVN] r16275 - gnunet/src/transport
Next by thread: [GNUnet-SVN] r16277 - gnunet/src/util
Index(es):
- Date
- Thread