From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 21 Oct 2010 13:32:02 +0000 (+0000)
Subject: sane defaults
X-Git-Tag: initial-import-from-subversion-38251~19992
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fae11058858342cb11dca0e7d18fb9f788519eb3;p=oweals%2Fgnunet.git

sane defaults
---

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index d41005cde..9c84f4191 100644
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -37,7 +37,7 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = resolver transport core topology hostlist
+DEFAULTSERVICES = topology hostlist
 UNIXPATH = /tmp/gnunet-service-arm.sock
 # GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
 # GLOBAL_PREFIX =
@@ -205,8 +205,8 @@ CONFIG = connect_timeout=10;dbname=gnunet
 
 [datastore-mysql]
 DATABASE = gnunet
-# CONFIG = ~/.my.cnf
-USER = gnunet
+CONFIG = ~/.my.cnf
+# USER = gnunet
 # PASSWORD =
 # HOST = 
 # PORT =