[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r884 - in GNUnet: contrib src/applications/dht/tools src/ap
|
From: |
durner |
|
Subject: |
[GNUnet-SVN] r884 - in GNUnet: contrib src/applications/dht/tools src/applications/fs/ecrs src/applications/fs/fsui src/applications/fs/lib src/applications/fs/module src/applications/gap src/applications/identity src/applications/session src/applications/sqstore_mysql src/applications/sqstore_sqlite src/applications/tbench src/util |
|
Date: |
Wed, 8 Jun 2005 09:12:03 -0700 (PDT) |
Author: durner
Date: 2005-06-08 09:11:03 -0700 (Wed, 08 Jun 2005)
New Revision: 884
Modified:
GNUnet/contrib/config-daemon.in
GNUnet/contrib/gnunet.root
GNUnet/contrib/gnunet.user
GNUnet/src/applications/dht/tools/peer1.conf
GNUnet/src/applications/dht/tools/peer2.conf
GNUnet/src/applications/fs/ecrs/check.conf
GNUnet/src/applications/fs/ecrs/namespace.c
GNUnet/src/applications/fs/fsui/check.conf
GNUnet/src/applications/fs/fsui/file_info.c
GNUnet/src/applications/fs/fsui/fsui.c
GNUnet/src/applications/fs/fsui/namespace_info.c
GNUnet/src/applications/fs/lib/check.conf
GNUnet/src/applications/fs/module/ondemand.c
GNUnet/src/applications/gap/peer1.conf
GNUnet/src/applications/gap/peer2.conf
GNUnet/src/applications/identity/check.conf
GNUnet/src/applications/identity/hostkey.c
GNUnet/src/applications/identity/identity.c
GNUnet/src/applications/session/peer1.conf
GNUnet/src/applications/session/peer2.conf
GNUnet/src/applications/sqstore_mysql/mysqltest.c
GNUnet/src/applications/sqstore_sqlite/sqlitetest.c
GNUnet/src/applications/tbench/peer1.conf
GNUnet/src/applications/tbench/peer2.conf
GNUnet/src/util/state.c
GNUnet/src/util/statuscallstest.c
Log:
Move sectionsless settings GNUNET_HOME and GNUNETD_HOME to the section GNUNET
and GNUNETD
Modified: GNUnet/contrib/config-daemon.in
===================================================================
--- GNUnet/contrib/config-daemon.in 2005-06-07 21:22:38 UTC (rev 883)
+++ GNUnet/contrib/config-daemon.in 2005-06-08 16:11:03 UTC (rev 884)
@@ -84,7 +84,7 @@
config LOGFILE
string "Where should logs go by default"
- default "$GNUNET_HOME/logs"
+ default "$GNUNETD_HOME/logs"
depends on Meta::ADVANCED
help
In which file should gnunetd write the logs? If you specify
@@ -105,7 +105,7 @@
config PIDFILE
string "Where should gnunetd write the PID"
- default "$GNUNET_HOME/gnunet.pid"
+ default "$GNUNETD_HOME/gnunet.pid"
depends on Meta::ADVANCED
help
In which file should gnunetd write the process-id of the
server? If
@@ -116,7 +116,7 @@
config HOSTS
string "Where should gnunetd keep the list of peers"
- default "$GNUNET_HOME/data/hosts/"
+ default "$GNUNETD_HOME/data/hosts/"
depends on Meta::ADVANCED
help
This directory should be made available periodically --- it
contains
@@ -731,7 +731,7 @@
config DIR
string "Directory for storing FS data"
- default "$GNUNET_HOME/data/fs/"
+ default "$GNUNETD_HOME/data/fs/"
depends on Meta::ADVANCED
help
Where to store the FS related data (content, etc)?
Modified: GNUnet/contrib/gnunet.root
===================================================================
--- GNUnet/contrib/gnunet.root 2005-06-07 21:22:38 UTC (rev 883)
+++ GNUnet/contrib/gnunet.root 2005-06-08 16:11:03 UTC (rev 884)
@@ -25,7 +25,12 @@
# 6) configuration for anonymous file sharing (AFS)
#
#################################################
-#
+
+#########################################
+# Options for the GNUnet server, gnunetd
+#########################################
+[GNUNETD]
+
# This line gives the root-directory of the GNUnet installation. Make
# sure there is some space left in that directory. :-) Users inserting
# or indexing files will be able to store data in this directory
@@ -34,11 +39,6 @@
# Default: GNUNETD_HOME = /var/lib/GNUnet
# GNUNETD_HOME = /var/lib/GNUnet
-#########################################
-# Options for the GNUnet server, gnunetd
-#########################################
-[GNUNETD]
-
# How many minutes is the current IP valid? (GNUnet will sign HELO
# messages with this expiration timeline. If you are on dialup, 60
# (for 1 hour) is suggested. If you are having a static IP address,
Modified: GNUnet/contrib/gnunet.user
===================================================================
--- GNUnet/contrib/gnunet.user 2005-06-07 21:22:38 UTC (rev 883)
+++ GNUnet/contrib/gnunet.user 2005-06-08 16:11:03 UTC (rev 884)
@@ -5,7 +5,12 @@
#
#
#################################################
-#
+
+
+###############################################
+# General client options...
+###############################################
+[GNUNET]
# This line gives the directory where GNUnet is putting
# user-specific files (such as pseudonyms). Typically,
# GNUnet should not put more than a few of MB there.
@@ -13,11 +18,6 @@
# Default is GNUNET_HOME = ~/.gnunet
GNUNET_HOME = ~/.gnunet
-
-###############################################
-# General client options...
-###############################################
-[GNUNET]
# Loglevel. What kinds of (debug) output should be printed? You can
# use NOTHING, FATAL, ERROR, FAILURE, WARNING, MESSAGE, INFO, DEBUG,
# CRON or EVERYTHING (which print more and more messages in this order).
Modified: GNUnet/src/applications/dht/tools/peer1.conf
===================================================================
--- GNUnet/src/applications/dht/tools/peer1.conf 2005-06-07 21:22:38 UTC
(rev 883)
+++ GNUnet/src/applications/dht/tools/peer1.conf 2005-06-08 16:11:03 UTC
(rev 884)
@@ -1,9 +1,8 @@
# This is the configuration for the GNUnet daemon when running
# the test in this directory (make check).
-GNUNETD_HOME = peer1
-
[GNUNETD]
+GNUNETD_HOME = peer1
# VALGRIND = 300
HELOEXPIRES = 60
LOGLEVEL = WARNING
Modified: GNUnet/src/applications/dht/tools/peer2.conf
===================================================================
--- GNUnet/src/applications/dht/tools/peer2.conf 2005-06-07 21:22:38 UTC
(rev 883)
+++ GNUnet/src/applications/dht/tools/peer2.conf 2005-06-08 16:11:03 UTC
(rev 884)
@@ -1,9 +1,8 @@
# This is the configuration for the GNUnet daemon when running
# the test in this directory (make check).
-GNUNETD_HOME = peer2
-
[GNUNETD]
+GNUNETD_HOME = peer2
# VALGRIND = 300
HELOEXPIRES = 60
LOGLEVEL = WARNING
Modified: GNUnet/src/applications/fs/ecrs/check.conf
===================================================================
--- GNUnet/src/applications/fs/ecrs/check.conf 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/fs/ecrs/check.conf 2005-06-08 16:11:03 UTC (rev
884)
@@ -1,9 +1,8 @@
# This is the configuration for the GNUnet daemon when running
# the test in this directory (make check).
-GNUNETD_HOME = /tmp/gnunet-check-ecrs
-
[GNUNETD]
+GNUNETD_HOME = /tmp/gnunet-check-ecrs
# VALGRIND = 300
HELOEXPIRES = 60
LOGLEVEL = NOTHING
Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2005-06-08 16:11:03 UTC (rev
884)
@@ -40,7 +40,7 @@
char * gnHome;
char * fileName;
- gnHome = getFileName("",
+ gnHome = getFileName("GNUNET",
"GNUNET_HOME",
_("Configuration file must specify a directory for"
" GNUnet to store per-peer data under %s%s.\n"));
Modified: GNUnet/src/applications/fs/fsui/check.conf
===================================================================
--- GNUnet/src/applications/fs/fsui/check.conf 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/fs/fsui/check.conf 2005-06-08 16:11:03 UTC (rev
884)
@@ -1,9 +1,8 @@
# This is the configuration for the GNUnet daemon when running
# the test in this directory (make check).
-GNUNETD_HOME = /tmp/gnunet-check-ecrs
-
[GNUNETD]
+GNUNETD_HOME = /tmp/gnunet-check-ecrs
# VALGRIND = 300
HELOEXPIRES = 60
LOGLEVEL = NOTHING
Modified: GNUnet/src/applications/fs/fsui/file_info.c
===================================================================
--- GNUnet/src/applications/fs/fsui/file_info.c 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/fs/fsui/file_info.c 2005-06-08 16:11:03 UTC (rev
884)
@@ -42,7 +42,7 @@
IPC_Semaphore * sem;
size_t n;
- basename = getConfigurationString("",
+ basename = getConfigurationString("GNUNET",
"GNUNET_HOME");
n = strlen(basename) + 512;
tmpname = MALLOC(n);
Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/fs/fsui/fsui.c 2005-06-08 16:11:03 UTC (rev
884)
@@ -290,7 +290,7 @@
ret = MALLOC(sizeof(FSUI_Context));
memset(ret, 0, sizeof(FSUI_Context));
- gh = getFileName("",
+ gh = getFileName("GNUNET",
"GNUNET_HOME",
"You must specify a directory for "
"user-data under '%s%s' at the beginning"
Modified: GNUnet/src/applications/fs/fsui/namespace_info.c
===================================================================
--- GNUnet/src/applications/fs/fsui/namespace_info.c 2005-06-07 21:22:38 UTC
(rev 883)
+++ GNUnet/src/applications/fs/fsui/namespace_info.c 2005-06-08 16:11:03 UTC
(rev 884)
@@ -42,7 +42,7 @@
char * fn;
char * fnBase;
- fn = getConfigurationString("", "GNUNET_HOME");
+ fn = getConfigurationString("GNUNET", "GNUNET_HOME");
fnBase = expandFileName(fn);
FREE(fn);
fn = MALLOC(strlen(fnBase) +
@@ -83,7 +83,7 @@
char * fnBase;
*meta = NULL;
- fn = getConfigurationString("", "GNUNET_HOME");
+ fn = getConfigurationString("GNUNET", "GNUNET_HOME");
fnBase = expandFileName(fn);
FREE(fn);
fn = MALLOC(strlen(fnBase) +
@@ -295,7 +295,7 @@
char * fn;
char * fnBase;
- fn = getConfigurationString("", "GNUNET_HOME");
+ fn = getConfigurationString("GNUNET", "GNUNET_HOME");
fnBase = expandFileName(fn);
FREE(fn);
fn = MALLOC(strlen(fnBase) +
@@ -323,7 +323,7 @@
char * tmp;
char * ret;
- ret = getConfigurationString("", "GNUNET_HOME");
+ ret = getConfigurationString("GNUNET", "GNUNET_HOME");
tmp = expandFileName(ret);
FREE(ret);
ret = MALLOC(strlen(tmp) + strlen(NS_UPDATE_DIR) +
Modified: GNUnet/src/applications/fs/lib/check.conf
===================================================================
--- GNUnet/src/applications/fs/lib/check.conf 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/fs/lib/check.conf 2005-06-08 16:11:03 UTC (rev
884)
@@ -1,9 +1,8 @@
# This is the configuration for the GNUnet daemon when running
# the test in this directory (make check).
-GNUNETD_HOME = /tmp/gnunet-check-fslib
-
[GNUNETD]
+GNUNETD_HOME = /tmp/gnunet-check-fslib
VALGRIND = 300
HELOEXPIRES = 60
LOGLEVEL = NOTHING
Modified: GNUnet/src/applications/fs/module/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/module/ondemand.c 2005-06-07 21:22:38 UTC
(rev 883)
+++ GNUnet/src/applications/fs/module/ondemand.c 2005-06-08 16:11:03 UTC
(rev 884)
@@ -121,7 +121,7 @@
= getConfigurationString("FS",
"INDEX-DIRECTORY");
if (!serverDir) {
- serverDir = getConfigurationString("",
+ serverDir = getConfigurationString("GNUNETD",
"GNUNETD_HOME");
if (!serverDir)
return SYSERR;
Modified: GNUnet/src/applications/gap/peer1.conf
===================================================================
--- GNUnet/src/applications/gap/peer1.conf 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/gap/peer1.conf 2005-06-08 16:11:03 UTC (rev
884)
@@ -1,9 +1,8 @@
# This is the configuration for the GNUnet daemon when running
# the test in this directory (make check).
-GNUNETD_HOME = peer1
-
[GNUNETD]
+GNUNETD_HOME = peer1
# VALGRIND = 300
HELOEXPIRES = 60
LOGLEVEL = WARNING
Modified: GNUnet/src/applications/gap/peer2.conf
===================================================================
--- GNUnet/src/applications/gap/peer2.conf 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/gap/peer2.conf 2005-06-08 16:11:03 UTC (rev
884)
@@ -1,9 +1,8 @@
# This is the configuration for the GNUnet daemon when running
# the test in this directory (make check).
-GNUNETD_HOME = peer2
-
[GNUNETD]
+GNUNETD_HOME = peer2
# VALGRIND = 300
HELOEXPIRES = 60
LOGLEVEL = WARNING
Modified: GNUnet/src/applications/identity/check.conf
===================================================================
--- GNUnet/src/applications/identity/check.conf 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/identity/check.conf 2005-06-08 16:11:03 UTC (rev
884)
@@ -1,9 +1,8 @@
# This is the configuration for the GNUnet daemon when running
# the test in this directory (make check).
-GNUNETD_HOME = /tmp/gnunet-check-identity
-
[GNUNETD]
+GNUNETD_HOME = /tmp/gnunet-check-identity
VALGRIND = 300
HELOEXPIRES = 60
LOGLEVEL = NOTHING
Modified: GNUnet/src/applications/identity/hostkey.c
===================================================================
--- GNUnet/src/applications/identity/hostkey.c 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/identity/hostkey.c 2005-06-08 16:11:03 UTC (rev
884)
@@ -93,7 +93,7 @@
unsigned short len;
int res;
- gnHome = getFileName("",
+ gnHome = getFileName("GNUNETD",
"GNUNETD_HOME",
_("Configuration file must specify a "
"directory for GNUnet to store "
Modified: GNUnet/src/applications/identity/identity.c
===================================================================
--- GNUnet/src/applications/identity/identity.c 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/identity/identity.c 2005-06-08 16:11:03 UTC (rev
884)
@@ -860,7 +860,7 @@
_("Configuration file must specify directory
for "
"network identities in section %s under
%s.\n"));
mkdirp(networkIdDirectory);
- gnHome = getFileName("",
+ gnHome = getFileName("GNUNETD",
"GNUNETD_HOME",
_("Configuration file must specify a "
"directory for GNUnet to store "
Modified: GNUnet/src/applications/session/peer1.conf
===================================================================
--- GNUnet/src/applications/session/peer1.conf 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/session/peer1.conf 2005-06-08 16:11:03 UTC (rev
884)
@@ -1,9 +1,8 @@
# This is the configuration for the GNUnet daemon when running
# the test in this directory (make check).
-GNUNETD_HOME = peer1
-
[GNUNETD]
+GNUNETD_HOME = peer1
# VALGRIND = 300
HELOEXPIRES = 60
LOGLEVEL = WARNING
Modified: GNUnet/src/applications/session/peer2.conf
===================================================================
--- GNUnet/src/applications/session/peer2.conf 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/session/peer2.conf 2005-06-08 16:11:03 UTC (rev
884)
@@ -1,9 +1,8 @@
# This is the configuration for the GNUnet daemon when running
# the test in this directory (make check).
-GNUNETD_HOME = peer2
-
[GNUNETD]
+GNUNETD_HOME = peer2
# VALGRIND = 300
HELOEXPIRES = 60
LOGLEVEL = WARNING
Modified: GNUnet/src/applications/sqstore_mysql/mysqltest.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysqltest.c 2005-06-07 21:22:38 UTC
(rev 883)
+++ GNUnet/src/applications/sqstore_mysql/mysqltest.c 2005-06-08 16:11:03 UTC
(rev 884)
@@ -237,7 +237,7 @@
FREENONNULL(setConfigurationString("GNUNETD",
"LOGLEVEL",
"WARNING"));
- FREENONNULL(setConfigurationString("",
+ FREENONNULL(setConfigurationString("GNUNETD",
"GNUNETD_HOME",
"/tmp/gnunet_test/"));
FREENONNULL(setConfigurationString("FILES",
Modified: GNUnet/src/applications/sqstore_sqlite/sqlitetest.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlitetest.c 2005-06-07 21:22:38 UTC
(rev 883)
+++ GNUnet/src/applications/sqstore_sqlite/sqlitetest.c 2005-06-08 16:11:03 UTC
(rev 884)
@@ -239,7 +239,7 @@
FREENONNULL(setConfigurationString("GNUNETD",
"LOGFILE",
NULL));
- FREENONNULL(setConfigurationString("",
+ FREENONNULL(setConfigurationString("GNUNETD",
"GNUNETD_HOME",
"/tmp/gnunet_test/"));
FREENONNULL(setConfigurationString("FILES",
Modified: GNUnet/src/applications/tbench/peer1.conf
===================================================================
--- GNUnet/src/applications/tbench/peer1.conf 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/tbench/peer1.conf 2005-06-08 16:11:03 UTC (rev
884)
@@ -1,9 +1,8 @@
# This is the configuration for the GNUnet daemon when running
# the test in this directory (make check).
-GNUNETD_HOME = peer1
-
[GNUNETD]
+GNUNETD_HOME = peer1
# VALGRIND = 300
HELOEXPIRES = 60
LOGLEVEL = WARNING
Modified: GNUnet/src/applications/tbench/peer2.conf
===================================================================
--- GNUnet/src/applications/tbench/peer2.conf 2005-06-07 21:22:38 UTC (rev
883)
+++ GNUnet/src/applications/tbench/peer2.conf 2005-06-08 16:11:03 UTC (rev
884)
@@ -1,9 +1,8 @@
# This is the configuration for the GNUnet daemon when running
# the test in this directory (make check).
-GNUNETD_HOME = peer2
-
[GNUNETD]
+GNUNETD_HOME = peer2
# VALGRIND = 300
HELOEXPIRES = 60
LOGLEVEL = WARNING
Modified: GNUnet/src/util/state.c
===================================================================
--- GNUnet/src/util/state.c 2005-06-07 21:22:38 UTC (rev 883)
+++ GNUnet/src/util/state.c 2005-06-08 16:11:03 UTC (rev 884)
@@ -69,14 +69,19 @@
char * dbh;
char * dir;
char * base;
+ char * baseSect;
if (testConfigurationString("GNUNETD",
"_MAGIC_",
- "YES"))
+ "YES")) {
base = "GNUNETD_HOME";
- else
+ baseSect = "GNUNETD";
+ }
+ else {
base = "GNUNET_HOME";
- dir = getFileName("",
+ baseSect = "GNUNET"
+ }
+ dir = getFileName(baseSect,
base,
_("Configuration file must specify a directory"
" for GNUnet to store per-peer data under %s%s.\n"));
Modified: GNUnet/src/util/statuscallstest.c
===================================================================
--- GNUnet/src/util/statuscallstest.c 2005-06-07 21:22:38 UTC (rev 883)
+++ GNUnet/src/util/statuscallstest.c 2005-06-08 16:11:03 UTC (rev 884)
@@ -43,7 +43,7 @@
FREENONNULL(setConfigurationString("GNUNETD",
"_MAGIC_",
"YES"));
- FREENONNULL(setConfigurationString("",
+ FREENONNULL(setConfigurationString("GNUNETD",
"GNUNETD_HOME",
"/tmp/gnunet_test/"));
FREENONNULL(setConfigurationString("FILES",
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r884 - in GNUnet: contrib src/applications/dht/tools src/applications/fs/ecrs src/applications/fs/fsui src/applications/fs/lib src/applications/fs/module src/applications/gap src/applications/identity src/applications/session src/applications/sqstore_mysql src/applications/sqstore_sqlite src/applications/tbench src/util,
durner <=