aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README4
-rw-r--r--contrib/Makefile.am3
-rw-r--r--contrib/defaults.conf505
-rw-r--r--contrib/test_gnunet_prefix.c2
-rw-r--r--src/arm/Makefile.am5
-rw-r--r--src/arm/arm.conf23
-rw-r--r--src/ats/Makefile.am5
-rw-r--r--src/ats/ats.conf24
-rw-r--r--src/block/Makefile.am5
-rw-r--r--src/block/block.conf2
-rw-r--r--src/chat/Makefile.am5
-rw-r--r--src/chat/chat.conf22
-rw-r--r--src/core/Makefile.am5
-rw-r--r--src/core/core.conf25
-rw-r--r--src/core/test_core_defaults.conf3
-rw-r--r--src/datacache/Makefile.am5
-rw-r--r--src/datacache/datacache.conf8
-rw-r--r--src/datastore/Makefile.am5
-rw-r--r--src/datastore/datastore.conf33
-rw-r--r--src/datastore/test_defaults.conf3
-rw-r--r--src/dht/Makefile.am5
-rw-r--r--src/dht/dht.conf38
-rw-r--r--src/dv/Makefile.am5
-rw-r--r--src/dv/dv.conf15
-rw-r--r--src/fs/Makefile.am5
-rw-r--r--src/fs/fs.conf32
-rw-r--r--src/fs/test_fs_defaults.conf3
-rw-r--r--src/hostlist/Makefile.am5
-rw-r--r--src/hostlist/hostlist.conf14
-rw-r--r--src/hostlist/test_hostlist_defaults.conf3
-rw-r--r--src/mesh/Makefile.am5
-rw-r--r--src/mesh/mesh.conf13
-rw-r--r--src/nat/Makefile.am5
-rw-r--r--src/nat/nat.conf54
-rw-r--r--src/nse/Makefile.am5
-rw-r--r--src/nse/nse.conf24
-rw-r--r--src/peerinfo/Makefile.am5
-rw-r--r--src/peerinfo/peerinfo.conf24
-rw-r--r--src/statistics/Makefile.am4
-rw-r--r--src/statistics/statistics.conf22
-rw-r--r--src/template/Makefile.am5
-rw-r--r--src/template/template.conf21
-rw-r--r--src/testing/Makefile.am5
-rw-r--r--src/testing/test_testing_defaults.conf3
-rw-r--r--src/testing/testing.conf11
-rw-r--r--src/topology/Makefile.am5
-rw-r--r--src/topology/topology.conf10
-rw-r--r--src/transport/Makefile.am5
-rw-r--r--src/transport/test_transport_defaults.conf3
-rw-r--r--src/transport/transport.conf66
-rw-r--r--src/util/Makefile.am5
-rw-r--r--src/util/configuration.c46
-rw-r--r--src/util/disk.c1
-rw-r--r--src/util/resolver.conf22
-rw-r--r--src/util/util.conf16
-rw-r--r--src/vpn/Makefile.am5
-rw-r--r--src/vpn/vpn.conf33
57 files changed, 720 insertions, 520 deletions
diff --git a/README b/README
index 978ae2916d..7c6470b267 100644
--- a/README
+++ b/README
@@ -123,8 +123,8 @@ The defaults that are shipped with the installation are usually ok,
you may want to adjust the limitations (space consumption, bandwidth,
etc.) though. The configuration files are human-readable. Note that
you MUST create "~/.gnunet/gnunet.conf" explicitly before starting
-GNUnet. You can either copy "defaults.conf" or simply create an empty
-file.
+GNUnet. You can either run gnunet-setup (available as part of the
+gnunet-gtk source package) or simply create an empty file.
Usage
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 5efbe5a32b..0ee7c4922b 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -14,8 +14,7 @@ noinst_SCRIPTS = \
gnunet_janitor.py
dist_pkgdata_DATA = \
- gnunet-logo-color.png \
- defaults.conf
+ gnunet-logo-color.png
EXTRA_DIST = \
coverage.sh \
diff --git a/contrib/defaults.conf b/contrib/defaults.conf
deleted file mode 100644
index 25bbf539ec..0000000000
--- a/contrib/defaults.conf
+++ /dev/null
@@ -1,505 +0,0 @@
-[PATHS]
-SERVICEHOME = ~/.gnunet/
-# SERVICEHOME = /var/lib/gnunet/
-# DEFAULTCONFIG = /etc/gnunet.conf
-# If 'DEFAULTCONFIG' is not defined, the current
-# configuration file is assumed to be the default,
-# which is what we want by default...
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[TESTING]
-WEAKRANDOM = NO
-# How long before failing a connection?
-CONNECT_TIMEOUT = 30
-# How many connect attempts should we make?
-CONNECT_ATTEMPTS = 3
-# How many connections can happen simultaneously?
-MAX_OUTSTANDING_CONNECTIONS = 50
-
-# Should we clean up the files on peer group shutdown?
-DELETE_FILES = YES
-
-[client]
-HOME = $SERVICEHOME
-
-[nat]
-# Are we behind NAT?
-BEHIND_NAT = NO
-
-# Is the NAT hole-punched?
-PUNCHED_NAT = NO
-
-# Enable UPNP by default?
-ENABLE_UPNP = NO
-
-# Use addresses from the local network interfaces (inluding loopback, but also others)
-USE_LOCALADDR = YES
-
-# Use address obtained from a DNS lookup of our hostname
-USE_HOSTNAME = NO
-
-# External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!)
-# normal interface IP address for non-NATed peers;
-# possibly auto-detected (using UPnP) if possible if not specified
-# EXTERNAL_ADDRESS =
-
-# Should we use ICMP-based NAT traversal to try connect to NATed peers
-# or, if we are behind NAT, to allow connections to us?
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-
-# IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
-# normal interface IP address for non-NATed peers;
-# likely auto-detected (via interface list) if not specified (!)
-# INTERNAL_ADDRESS =
-
-# Disable IPv6 support
-DISABLEV6 = NO
-
-# How often do we query the DNS resolver
-# for our hostname (to get our own IP), in ms
-HOSTNAME_DNS_FREQUENCY = 1200000
-
-# How often do we iterate over our
-# network interfaces to check for changes
-# in our IP address? in ms
-IFC_SCAN_FREQUENCY = 3000000
-
-# How often do we query the DNS resolver
-# for our hostname (to get our own IP), in ms
-DYNDNS_FREQUENCY = 140000
-
-# Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
-RETURN_LOCAL_ADDRESSES = NO
-
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 5724
-
-[transport-tcp]
-# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
-PORT = 2086
-ADVERTISED_PORT = 2086
-
-# Maximum number of open TCP connections allowed
-MAX_CONNECTIONS = 128
-
-TIMEOUT = 5000
-
-# ACCEPT_FROM =
-# ACCEPT_FROM6 =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# BINDTO =
-
-MAX_CONNECTIONS = 128
-
-
-[transport-udp]
-PORT = 2086
-#BROADCAST = YES
-#BROADCAST_PORT = 20089
-#BROADCAST_INTERVAL = 30000
-
-
-MAX_BPS = 1000000
-
-
-[transport-http]
-PORT = 1080
-MAX_CONNECTIONS = 128
-
-[transport-https]
-PORT = 4433
-CRYPTO_INIT = NORMAL
-KEY_FILE = https.key
-CERT_FILE = https.cert
-MAX_CONNECTIONS = 128
-
-
-[transport-wlan]
-# Name of the interface in monitor mode (typically monX)
-INTERFACE = mon0
-# Real hardware, no testing
-TESTMODE = 0
-
-
-[arm]
-PORT = 2087
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist
-UNIXPATH = /tmp/gnunet-service-arm.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
-# GLOBAL_PREFIX =
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[statistics]
-AUTOSTART = YES
-PORT = 2088
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-statistics.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-# DISABLE_SOCKET_FORWARDING = NO
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[resolver]
-AUTOSTART = YES
-PORT = 2089
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-resolver.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
-# DISABLE_SOCKET_FORWARDING = NO
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[peerinfo]
-AUTOSTART = YES
-PORT = 2090
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-peerinfo
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-peerinfo.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-# DISABLE_SOCKET_FORWARDING = NO
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-HOSTS = $SERVICEHOME/data/hosts/
-
-
-[transport]
-AUTOSTART = YES
-PORT = 2091
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-transport
-#PREFIX = valgrind
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-service-transport.sock
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-# DISABLE_SOCKET_FORWARDING = NO
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[ats]
-AUTOSTART = YES
-PORT = 2098
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-ats.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-TOTAL_QUOTA_IN = 65536
-TOTAL_QUOTA_OUT = 65536
-# ATS options
-DUMP_MLP = NO
-DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
-DUMP_MIN_PEERS = 0
-DUMP_MIN_ADDRS = 0
-DUMP_OVERWRITE = NO
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
-
-
-[core]
-AUTOSTART = YES
-PORT = 2092
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-# quotas are in bytes per second now!
-TOTAL_QUOTA_IN = 65536
-TOTAL_QUOTA_OUT = 65536
-UNIXPATH = /tmp/gnunet-service-core.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-# DISABLE_SOCKET_FORWARDING = NO
-# DEBUG = YES
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-
-[topology]
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
-AUTOCONNECT = YES
-TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-daemon-topology
-
-[hostlist]
-# port for hostlist http server
-HTTPPORT = 8080
-HOME = $SERVICEHOME
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-daemon-hostlist
-# consider having "-e" as default as well once implemented
-OPTIONS = -b
-SERVERS = http://v9.gnunet.org:58080/
-# proxy for downloading hostlists
-HTTP-PROXY =
-
-
-[datastore]
-AUTOSTART = YES
-UNIXPATH = /tmp/gnunet-service-datastore.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PORT = 2093
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 100000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-# DISABLE_SOCKET_FORWARDING = NO
-
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
-
-[datastore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
-
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
-# USER = gnunet
-# PASSWORD =
-# HOST = localhost
-# PORT = 3306
-
-[datacache-mysql]
-DATABASE = gnunetcheck
-CONFIG = ~/.my.cnf
-# USER = gnunet
-# PASSWORD =
-# HOST = localhost
-# PORT = 3306
-
-
-[fs]
-AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-PORT = 2094
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-
-UNIXPATH = /tmp/gnunet-service-fs.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-# DISABLE_SOCKET_FORWARDING = NO
-# DEBUG = YES
-MAX_PENDING_REQUESTS = 65536
-# Maximum frequency we're allowed to poll the datastore
-# for content for migration (can be used to reduce
-# GNUnet's disk-IO rate)
-MIN_MIGRATION_DELAY = 100
-EXPECTED_NEIGHBOUR_COUNT = 128
-
-[dht]
-AUTOSTART = YES
-PORT = 2095
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/gnunet-service-dht.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-# DISABLE_SOCKET_FORWARDING = NO
-# DEBUG = YES
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-# DO_FIND_PEER =
-# STRICT_KADEMLIA =
-# USE_MAX_HOPS =
-# MAX_HOPS =
-# REPUBLISH = YES
-# REPLICATION_FREQUENCY = 60
-# STOP_ON_CLOSEST =
-# STOP_FOUND =
-# CONVERGE_MODIFIER =
-
-
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1024000
-
-[block]
-PLUGINS = fs dht test dns
-
-[mesh]
-AUTOSTART = YES
-PORT = 2096
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[nse]
-AUTOSTART = YES
-PORT = 2097
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-nse-service-nse.unix
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PROOFFILE = $SERVICEHOME/.nse-proof
-HISTOGRAM = $SERVICEHOME/nse-history.log
-
-# How 'slowly' should the proof-of-work be constructed (delay
-# between rounds in ms); sane values between 0 and ~1000.
-WORKDELAY = 5
-
-# Note: changing any of the values below will make this peer
-# completely incompatible with other peers!
-INTERVAL = 3600000
-WORKBITS = 20
-
-
-[vpn]
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-daemon-vpn
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
-
-[exit]
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-[dns]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-dns.sock
-PROVIDE_EXIT = NO
-
diff --git a/contrib/test_gnunet_prefix.c b/contrib/test_gnunet_prefix.c
index ea81371070..732e8ebac4 100644
--- a/contrib/test_gnunet_prefix.c
+++ b/contrib/test_gnunet_prefix.c
@@ -43,7 +43,7 @@ main (int argc,
_("Testcases will not work!\n"));
return 1;
}
- dirname = DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR "defaults.conf";
+ dirname = DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR "config.d";
{
char tmp[strlen (basename) + strlen (dirname) + 1];
sprintf (tmp, "%s%s", basename, dirname);
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index bd6e7e0e75..9ed8bbe159 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -1,5 +1,10 @@
INCLUDES = -I$(top_srcdir)/src/include
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+dist_pkgcfg_DATA = \
+ arm.conf
+
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
endif
diff --git a/src/arm/arm.conf b/src/arm/arm.conf
new file mode 100644
index 0000000000..beb3d30c83
--- /dev/null
+++ b/src/arm/arm.conf
@@ -0,0 +1,23 @@
+
+[arm]
+PORT = 2087
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-arm
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+DEFAULTSERVICES = topology hostlist
+UNIXPATH = /tmp/gnunet-service-arm.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
+# GLOBAL_PREFIX =
+# USERNAME =
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX = \ No newline at end of file
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 5cba4fccb1..0db590a81a 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -1,5 +1,10 @@
INCLUDES = -I$(top_srcdir)/src/include
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+dist_pkgcfg_DATA = \
+ ats.conf
+
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
endif
diff --git a/src/ats/ats.conf b/src/ats/ats.conf
new file mode 100644
index 0000000000..f5d6c77653
--- /dev/null
+++ b/src/ats/ats.conf
@@ -0,0 +1,24 @@
+[ats]
+AUTOSTART = YES
+PORT = 2098
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-ats
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-ats.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+TOTAL_QUOTA_IN = 65536
+TOTAL_QUOTA_OUT = 65536
+# ATS options
+DUMP_MLP = NO
+DUMP_SOLUTION = NO
+DUMP_OVERWRITE = NO
+DUMP_MIN_PEERS = 0
+DUMP_MIN_ADDRS = 0
+DUMP_OVERWRITE = NO
+ATS_MIN_INTERVAL = 15000
+ATS_EXEC_INTERVAL = 30000
diff --git a/src/block/Makefile.am b/src/block/Makefile.am
index 4522966136..96b66c3eeb 100644
--- a/src/block/Makefile.am
+++ b/src/block/Makefile.am
@@ -2,6 +2,11 @@ INCLUDES = -I$(top_srcdir)/src/include
plugindir = $(libdir)/gnunet
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+dist_pkgcfg_DATA = \
+ block.conf
+
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
endif
diff --git a/src/block/block.conf b/src/block/block.conf
new file mode 100644
index 0000000000..dbae438b7a
--- /dev/null
+++ b/src/block/block.conf
@@ -0,0 +1,2 @@
+[block]
+PLUGINS = fs dht test dns \ No newline at end of file
diff --git a/src/chat/Makefile.am b/src/chat/Makefile.am
index dcf1f5a2d5..859e8f1f1c 100644
--- a/src/chat/Makefile.am
+++ b/src/chat/Makefile.am
@@ -1,5 +1,10 @@
INCLUDES = -I$(top_srcdir)/src/include
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+dist_pkgcfg_DATA = \
+ chat.conf
+
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
endif
diff --git a/src/chat/chat.conf b/src/chat/chat.conf
new file mode 100644
index 0000000000..61d551e166
--- /dev/null
+++ b/src/chat/chat.conf
@@ -0,0 +1,22 @@
+[chat]
+AUTOSTART = YES
+PORT = 2090
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-chat
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-chat.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
+# DISABLE_SOCKET_FORWARDING = NO
+# USERNAME =
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX =
+
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index b2629a567b..13054d15a3 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,5 +1,10 @@
INCLUDES = -I$(top_srcdir)/src/include
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+dist_pkgcfg_DATA = \
+ core.conf
+
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
endif
diff --git a/src/core/core.conf b/src/core/core.conf
new file mode 100644
index 0000000000..1d7815ad60
--- /dev/null
+++ b/src/core/core.conf
@@ -0,0 +1,25 @@
+[core]
+AUTOSTART = YES
+PORT = 2092
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-core
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+# quotas are in bytes per second now!
+TOTAL_QUOTA_IN = 65536
+TOTAL_QUOTA_OUT = 65536
+UNIXPATH = /tmp/gnunet-service-core.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+# DISABLE_SOCKET_FORWARDING = NO
+# DEBUG = YES
+# USERNAME =
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX =
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf
index 5d8da2d34a..b3b7450958 100644
--- a/src/core/test_core_defaults.conf
+++ b/src/core/test_core_defaults.conf
@@ -43,3 +43,6 @@ AUTOSTART = NO
[nse]
AUTOSTART = NO
+
+[dv]
+AUTOSTART = NO \ No newline at end of file
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index 8e4f265cdb..5a3d22bbb8 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -2,6 +2,11 @@ INCLUDES = -I$(top_srcdir)/src/include
plugindir = $(libdir)/gnunet
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+dist_pkgcfg_DATA = \
+ datacache.conf
+
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
endif
diff --git a/src/datacache/datacache.conf b/src/datacache/datacache.conf
new file mode 100644
index 0000000000..fb850f39fd
--- /dev/null
+++ b/src/datacache/datacache.conf
@@ -0,0 +1,8 @@
+[datacache-mysql]
+DATABASE = gnunetcheck
+CONFIG = ~/.my.cnf
+# USER = gnunet
+# PASSWORD =
+# HOST = localhost
+# PORT = 3306
+
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index cecda89b43..cab08bc0fb 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -2,6 +2,11 @@ INCLUDES = -I$(top_srcdir)/src/include
plugindir = $(libdir)/gnunet
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+dist_pkgcfg_DATA = \
+ datastore.conf
+
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
endif
diff --git a/src/datastore/datastore.conf b/src/datastore/datastore.conf
new file mode 100644
index 0000000000..ed44036c7e
--- /dev/null
+++ b/src/datastore/datastore.conf
@@ -0,0 +1,33 @@
+[datastore]
+AUTOSTART = YES
+UNIXPATH = /tmp/gnunet-service-datastore.sock
+UNIX_MATCH_UID = YES