[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16837 - gnunet/src/datastore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r16837 - gnunet/src/datastore |
|
Date: |
Wed, 14 Sep 2011 14:40:08 +0200 |
Author: grothoff
Date: 2011-09-14 14:40:08 +0200 (Wed, 14 Sep 2011)
New Revision: 16837
Added:
gnunet/src/datastore/test_defaults.conf
Modified:
gnunet/src/datastore/perf_plugin_datastore_data_mysql.conf
gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
gnunet/src/datastore/perf_plugin_datastore_data_sqlite.conf
gnunet/src/datastore/test_datastore_api_data_mysql.conf
gnunet/src/datastore/test_datastore_api_data_postgres.conf
gnunet/src/datastore/test_datastore_api_data_sqlite.conf
gnunet/src/datastore/test_plugin_datastore_data_mysql.conf
gnunet/src/datastore/test_plugin_datastore_data_postgres.conf
gnunet/src/datastore/test_plugin_datastore_data_sqlite.conf
Log:
simplifying configs
Modified: gnunet/src/datastore/perf_plugin_datastore_data_mysql.conf
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore_data_mysql.conf 2011-09-14
12:33:00 UTC (rev 16836)
+++ gnunet/src/datastore/perf_plugin_datastore_data_mysql.conf 2011-09-14
12:40:08 UTC (rev 16837)
@@ -1,45 +1,11 @@
address@hidden@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/perf-gnunet-datastore-mysql/
+DEFAULTCONFIG = perf_plugin_datastore_data_mysql.conf
[datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 1000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
DATABASE = mysql
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[dht]
-AUTOSTART = NO
-
[datastore-mysql]
DATABASE = gnunetcheck
-# CONFIG = ~/.my.cnf
-# USER =
-# PASSWORD =
-# HOST =
-# PORT =
-[dns]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-
Modified: gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
2011-09-14 12:33:00 UTC (rev 16836)
+++ gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
2011-09-14 12:40:08 UTC (rev 16837)
@@ -1,40 +1,11 @@
address@hidden@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/perf-gnunet-datastore-postgres/
+DEFAULTCONFIG = perf_plugin_datastore_data_postgres.conf
[datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 1000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
DATABASE = postgres
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-# DEBUG = YES
-[dht]
-AUTOSTART = NO
-
[datastore-postgres]
CONFIG = dbname=gnunetcheck
-[dns]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-
Modified: gnunet/src/datastore/perf_plugin_datastore_data_sqlite.conf
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore_data_sqlite.conf 2011-09-14
12:33:00 UTC (rev 16836)
+++ gnunet/src/datastore/perf_plugin_datastore_data_sqlite.conf 2011-09-14
12:40:08 UTC (rev 16837)
@@ -1,38 +1,5 @@
address@hidden@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/perf-gnunet-datastore-sqlite/
+DEFAULTCONFIG = perf_plugin_datastore_data_sqlite.conf
-[datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 1000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-
Modified: gnunet/src/datastore/test_datastore_api_data_mysql.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_mysql.conf 2011-09-14
12:33:00 UTC (rev 16836)
+++ gnunet/src/datastore/test_datastore_api_data_mysql.conf 2011-09-14
12:40:08 UTC (rev 16837)
@@ -1,68 +1,28 @@
address@hidden@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-mysql/
+DEFAULTCONFIG = test_datastore_api_data_mysql.conf
+[TESTING]
+WEAKRANDOM = YES
+
[arm]
-DEFAULTSERVICES =
PORT = 42466
-HOSTNAME = localhost
+DEFAULTSERVICES =
+[statistics]
+PORT = 22667
+
[resolver]
PORT = 42464
-HOSTNAME = localhost
[datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
QUOTA = 10000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
DATABASE = mysql
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-# DEBUG = YES
-# PREFIX = xterm -T datastore -e gdb --args
-# PREFIX = valgrind --tool=memcheck --leak-check=yes
-BINARY = gnunet-service-datastore
[datastore-mysql]
DATABASE = gnunetcheck
-# CONFIG = ~/.my.cnf
-# USER =
-# PASSWORD =
-# HOST =
-# PORT =
-[statistics]
-PORT = 22667
-HOSTNAME = localhost
-
-[testing]
-WEAKRANDOM = YES
-
-[dht]
-AUTOSTART = NO
-
-
[fs]
AUTOSTART = NO
-[dns]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-
Modified: gnunet/src/datastore/test_datastore_api_data_postgres.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_postgres.conf 2011-09-14
12:33:00 UTC (rev 16836)
+++ gnunet/src/datastore/test_datastore_api_data_postgres.conf 2011-09-14
12:40:08 UTC (rev 16837)
@@ -1,63 +1,28 @@
address@hidden@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-postgres/
+DEFAULTCONFIG = test_datastore_api_data_postgres.conf
+[TESTING]
+WEAKRANDOM = YES
+
[arm]
-DEFAULTSERVICES =
PORT = 42466
-HOSTNAME = localhost
+DEFAULTSERVICES =
+[statistics]
+PORT = 22667
+
[resolver]
PORT = 42464
-HOSTNAME = localhost
[datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
QUOTA = 10000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
DATABASE = postgres
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-# DEBUG = YES
-# PREFIX = xterm -T datastore -e gdb --args
-# PREFIX = valgrind --tool=memcheck --leak-check=yes
-BINARY = gnunet-service-datastore
[datastore-postgres]
CONFIG = dbname=gnunetcheck
-[statistics]
-PORT = 22667
-HOSTNAME = localhost
-
-[testing]
-WEAKRANDOM = YES
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
[fs]
AUTOSTART = NO
-[dns]
-AUTOSTART = NO
-
-
-[nse]
-AUTOSTART = NO
-
-
Modified: gnunet/src/datastore/test_datastore_api_data_sqlite.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_sqlite.conf 2011-09-14
12:33:00 UTC (rev 16836)
+++ gnunet/src/datastore/test_datastore_api_data_sqlite.conf 2011-09-14
12:40:08 UTC (rev 16837)
@@ -1,60 +1,24 @@
address@hidden@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/
+DEFAULTCONFIG = test_datastore_api_data_sqlite.conf
+[TESTING]
+WEAKRANDOM = YES
+
[arm]
-DEFAULTSERVICES =
PORT = 42466
-HOSTNAME = localhost
+DEFAULTSERVICES =
+[statistics]
+PORT = 22667
+
[resolver]
PORT = 42464
-HOSTNAME = localhost
[datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
QUOTA = 10000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-datastore
-[statistics]
-PORT = 22667
-HOSTNAME = localhost
-
-[testing]
-WEAKRANDOM = YES
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
[fs]
AUTOSTART = NO
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-
Added: gnunet/src/datastore/test_defaults.conf
===================================================================
--- gnunet/src/datastore/test_defaults.conf (rev 0)
+++ gnunet/src/datastore/test_defaults.conf 2011-09-14 12:40:08 UTC (rev
16837)
@@ -0,0 +1,15 @@
+[datastore]
+PORT = 22654
+QUOTA = 1000000
+
+[dht]
+AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+[mesh]
+AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO
Modified: gnunet/src/datastore/test_plugin_datastore_data_mysql.conf
===================================================================
--- gnunet/src/datastore/test_plugin_datastore_data_mysql.conf 2011-09-14
12:33:00 UTC (rev 16836)
+++ gnunet/src/datastore/test_plugin_datastore_data_mysql.conf 2011-09-14
12:40:08 UTC (rev 16837)
@@ -1,45 +1,11 @@
address@hidden@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-plugin-mysql/
+DEFAULTCONFIG = test_plugin_datastore_data_mysql.conf
[datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 1000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
DATABASE = mysql
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[dht]
-AUTOSTART = NO
-
[datastore-mysql]
DATABASE = gnunetcheck
-# CONFIG = ~/.my.cnf
-# USER =
-# PASSWORD =
-# HOST =
-# PORT =
-[dns]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-
Modified: gnunet/src/datastore/test_plugin_datastore_data_postgres.conf
===================================================================
--- gnunet/src/datastore/test_plugin_datastore_data_postgres.conf
2011-09-14 12:33:00 UTC (rev 16836)
+++ gnunet/src/datastore/test_plugin_datastore_data_postgres.conf
2011-09-14 12:40:08 UTC (rev 16837)
@@ -1,40 +1,11 @@
address@hidden@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-plugin-postgres/
+DEFAULTCONFIG = test_plugin_datastore_data_postgres.conf
[datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 1000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
DATABASE = postgres
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[dht]
-AUTOSTART = NO
-
[datastore-postgres]
CONFIG = dbname=gnunetcheck
-[dns]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-
Modified: gnunet/src/datastore/test_plugin_datastore_data_sqlite.conf
===================================================================
--- gnunet/src/datastore/test_plugin_datastore_data_sqlite.conf 2011-09-14
12:33:00 UTC (rev 16836)
+++ gnunet/src/datastore/test_plugin_datastore_data_sqlite.conf 2011-09-14
12:40:08 UTC (rev 16837)
@@ -1,38 +1,5 @@
address@hidden@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-plugin-sqlite/
+DEFAULTCONFIG = test_plugin_datastore_data_sqlite.conf
-[datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 1000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16837 - gnunet/src/datastore,
gnunet <=