aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-11-03 13:19:52 +0000
committerChristian Grothoff <christian@grothoff.org>2011-11-03 13:19:52 +0000
commit29c724d2a7764f83fe846b418d09540348b86983 (patch)
treedafaff8e37ba51355b22b6f38d856ae49e145006
parentb303961f38c9b578f30248ee364ed4e5ffdcd06c (diff)
downloadgnunet-29c724d2a7764f83fe846b418d09540348b86983.tar.gz
gnunet-29c724d2a7764f83fe846b418d09540348b86983.zip
implementing #1747
-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 978ae2916..7c6470b26 100644
--- a/README
+++ b/README
@@ -123,8 +123,8 @@ The defaults that are shipped with the installation are usually ok,
123you may want to adjust the limitations (space consumption, bandwidth, 123you may want to adjust the limitations (space consumption, bandwidth,
124etc.) though. The configuration files are human-readable. Note that 124etc.) though. The configuration files are human-readable. Note that
125you MUST create "~/.gnunet/gnunet.conf" explicitly before starting 125you MUST create "~/.gnunet/gnunet.conf" explicitly before starting
126GNUnet. You can either copy "defaults.conf" or simply create an empty 126GNUnet. You can either run gnunet-setup (available as part of the
127file. 127gnunet-gtk source package) or simply create an empty file.
128 128
129 129
130Usage 130Usage
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 5efbe5a32..0ee7c4922 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -14,8 +14,7 @@ noinst_SCRIPTS = \
14 gnunet_janitor.py 14 gnunet_janitor.py
15 15
16dist_pkgdata_DATA = \ 16dist_pkgdata_DATA = \
17 gnunet-logo-color.png \ 17 gnunet-logo-color.png
18 defaults.conf
19 18
20EXTRA_DIST = \ 19EXTRA_DIST = \
21 coverage.sh \ 20 coverage.sh \
diff --git a/contrib/defaults.conf b/contrib/defaults.conf
deleted file mode 100644
index 25bbf539e..000000000
--- a/contrib/defaults.conf
+++ /dev/null
@@ -1,505 +0,0 @@
1[PATHS]
2SERVICEHOME = ~/.gnunet/
3# SERVICEHOME = /var/lib/gnunet/
4# DEFAULTCONFIG = /etc/gnunet.conf
5# If 'DEFAULTCONFIG' is not defined, the current
6# configuration file is assumed to be the default,
7# which is what we want by default...
8
9[gnunetd]
10HOSTKEY = $SERVICEHOME/.hostkey
11
12[TESTING]
13WEAKRANDOM = NO
14# How long before failing a connection?
15CONNECT_TIMEOUT = 30
16# How many connect attempts should we make?
17CONNECT_ATTEMPTS = 3
18# How many connections can happen simultaneously?
19MAX_OUTSTANDING_CONNECTIONS = 50
20
21# Should we clean up the files on peer group shutdown?
22DELETE_FILES = YES
23
24[client]
25HOME = $SERVICEHOME
26
27[nat]
28# Are we behind NAT?
29BEHIND_NAT = NO
30
31# Is the NAT hole-punched?
32PUNCHED_NAT = NO
33
34# Enable UPNP by default?
35ENABLE_UPNP = NO
36
37# Use addresses from the local network interfaces (inluding loopback, but also others)
38USE_LOCALADDR = YES
39
40# Use address obtained from a DNS lookup of our hostname
41USE_HOSTNAME = NO
42
43# External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!)
44# normal interface IP address for non-NATed peers;
45# possibly auto-detected (using UPnP) if possible if not specified
46# EXTERNAL_ADDRESS =
47
48# Should we use ICMP-based NAT traversal to try connect to NATed peers
49# or, if we are behind NAT, to allow connections to us?
50ENABLE_ICMP_CLIENT = NO
51ENABLE_ICMP_SERVER = NO
52
53# IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
54# normal interface IP address for non-NATed peers;
55# likely auto-detected (via interface list) if not specified (!)
56# INTERNAL_ADDRESS =
57
58# Disable IPv6 support
59DISABLEV6 = NO
60
61# How often do we query the DNS resolver
62# for our hostname (to get our own IP), in ms
63HOSTNAME_DNS_FREQUENCY = 1200000
64
65# How often do we iterate over our
66# network interfaces to check for changes
67# in our IP address? in ms
68IFC_SCAN_FREQUENCY = 3000000
69
70# How often do we query the DNS resolver
71# for our hostname (to get our own IP), in ms
72DYNDNS_FREQUENCY = 140000
73
74# Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
75RETURN_LOCAL_ADDRESSES = NO
76
77[gnunet-nat-server]
78HOSTNAME = gnunet.org
79PORT = 5724
80
81[transport-tcp]
82# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
83PORT = 2086
84ADVERTISED_PORT = 2086
85
86# Maximum number of open TCP connections allowed
87MAX_CONNECTIONS = 128
88
89TIMEOUT = 5000
90
91# ACCEPT_FROM =
92# ACCEPT_FROM6 =
93# REJECT_FROM =
94# REJECT_FROM6 =
95# BINDTO =
96
97MAX_CONNECTIONS = 128
98
99
100[transport-udp]
101PORT = 2086
102#BROADCAST = YES
103#BROADCAST_PORT = 20089
104#BROADCAST_INTERVAL = 30000
105
106
107MAX_BPS = 1000000
108
109
110[transport-http]
111PORT = 1080
112MAX_CONNECTIONS = 128
113
114[transport-https]
115PORT = 4433
116CRYPTO_INIT = NORMAL
117KEY_FILE = https.key
118CERT_FILE = https.cert
119MAX_CONNECTIONS = 128
120
121
122[transport-wlan]
123# Name of the interface in monitor mode (typically monX)
124INTERFACE = mon0
125# Real hardware, no testing
126TESTMODE = 0
127
128
129[arm]
130PORT = 2087
131HOSTNAME = localhost
132HOME = $SERVICEHOME
133CONFIG = $DEFAULTCONFIG
134BINARY = gnunet-service-arm
135ACCEPT_FROM = 127.0.0.1;
136ACCEPT_FROM6 = ::1;
137DEFAULTSERVICES = topology hostlist
138UNIXPATH = /tmp/gnunet-service-arm.sock
139UNIX_MATCH_UID = YES
140UNIX_MATCH_GID = YES
141# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
142# GLOBAL_PREFIX =
143# USERNAME =
144# MAXBUF =
145# TIMEOUT =
146# DISABLEV6 =
147# BINDTO =
148# REJECT_FROM =
149# REJECT_FROM6 =
150# PREFIX =
151
152[statistics]
153AUTOSTART = YES
154PORT = 2088
155HOSTNAME = localhost
156HOME = $SERVICEHOME
157CONFIG = $DEFAULTCONFIG
158BINARY = gnunet-service-statistics
159ACCEPT_FROM = 127.0.0.1;
160ACCEPT_FROM6 = ::1;
161UNIXPATH = /tmp/gnunet-service-statistics.sock
162UNIX_MATCH_UID = NO
163UNIX_MATCH_GID = YES
164# DISABLE_SOCKET_FORWARDING = NO
165# USERNAME =
166# MAXBUF =
167# TIMEOUT =
168# DISABLEV6 =
169# BINDTO =
170# REJECT_FROM =
171# REJECT_FROM6 =
172# PREFIX =
173
174[resolver]
175AUTOSTART = YES
176PORT = 2089
177HOSTNAME = localhost
178HOME = $SERVICEHOME
179CONFIG = $DEFAULTCONFIG
180BINARY = gnunet-service-resolver
181ACCEPT_FROM = 127.0.0.1;
182ACCEPT_FROM6 = ::1;
183UNIXPATH = /tmp/gnunet-service-resolver.sock
184UNIX_MATCH_UID = NO
185UNIX_MATCH_GID = NO
186# DISABLE_SOCKET_FORWARDING = NO
187# USERNAME =
188# MAXBUF =
189# TIMEOUT =
190# DISABLEV6 =
191# BINDTO =
192# REJECT_FROM =
193# REJECT_FROM6 =
194# PREFIX =
195
196[peerinfo]
197AUTOSTART = YES
198PORT = 2090
199HOSTNAME = localhost
200HOME = $SERVICEHOME
201CONFIG = $DEFAULTCONFIG
202BINARY = gnunet-service-peerinfo
203ACCEPT_FROM = 127.0.0.1;
204ACCEPT_FROM6 = ::1;
205UNIXPATH = /tmp/gnunet-service-peerinfo.sock
206UNIX_MATCH_UID = NO
207UNIX_MATCH_GID = YES
208# DISABLE_SOCKET_FORWARDING = NO
209# USERNAME =
210# MAXBUF =
211# TIMEOUT =
212# DISABLEV6 =
213# BINDTO =
214# REJECT_FROM =
215# REJECT_FROM6 =
216# PREFIX =
217HOSTS = $SERVICEHOME/data/hosts/
218
219
220[transport]
221AUTOSTART = YES
222PORT = 2091
223HOSTNAME = localhost
224HOME = $SERVICEHOME
225CONFIG = $DEFAULTCONFIG
226BINARY = gnunet-service-transport
227#PREFIX = valgrind
228NEIGHBOUR_LIMIT = 50
229ACCEPT_FROM = 127.0.0.1;
230ACCEPT_FROM6 = ::1;
231PLUGINS = tcp
232UNIXPATH = /tmp/gnunet-service-transport.sock
233BLACKLIST_FILE = $SERVICEHOME/blacklist
234UNIX_MATCH_UID = YES
235UNIX_MATCH_GID = YES
236# DISABLE_SOCKET_FORWARDING = NO
237# USERNAME =
238# MAXBUF =
239# TIMEOUT =
240# DISABLEV6 =
241# BINDTO =
242# REJECT_FROM =
243# REJECT_FROM6 =
244# PREFIX =
245
246[ats]
247AUTOSTART = YES
248PORT = 2098
249HOSTNAME = localhost
250HOME = $SERVICEHOME
251CONFIG = $DEFAULTCONFIG
252BINARY = gnunet-service-ats
253ACCEPT_FROM = 127.0.0.1;
254ACCEPT_FROM6 = ::1;
255UNIXPATH = /tmp/gnunet-service-ats.sock
256UNIX_MATCH_UID = YES
257UNIX_MATCH_GID = YES
258
259TOTAL_QUOTA_IN = 65536
260TOTAL_QUOTA_OUT = 65536
261# ATS options
262DUMP_MLP = NO
263DUMP_SOLUTION = NO
264DUMP_OVERWRITE = NO
265DUMP_MIN_PEERS = 0
266DUMP_MIN_ADDRS = 0
267DUMP_OVERWRITE = NO
268ATS_MIN_INTERVAL = 15000
269ATS_EXEC_INTERVAL = 30000
270
271
272[core]
273AUTOSTART = YES
274PORT = 2092
275HOSTNAME = localhost
276HOME = $SERVICEHOME
277CONFIG = $DEFAULTCONFIG
278BINARY = gnunet-service-core
279ACCEPT_FROM = 127.0.0.1;
280ACCEPT_FROM6 = ::1;
281# quotas are in bytes per second now!
282TOTAL_QUOTA_IN = 65536
283TOTAL_QUOTA_OUT = 65536
284UNIXPATH = /tmp/gnunet-service-core.sock
285UNIX_MATCH_UID = YES
286UNIX_MATCH_GID = YES
287# DISABLE_SOCKET_FORWARDING = NO
288# DEBUG = YES
289# USERNAME =
290# MAXBUF =
291# TIMEOUT =
292# DISABLEV6 =
293# BINDTO =
294# REJECT_FROM =
295# REJECT_FROM6 =
296# PREFIX =
297
298
299[topology]
300MINIMUM-FRIENDS = 0
301FRIENDS-ONLY = NO
302AUTOCONNECT = YES
303TARGET-CONNECTION-COUNT = 16
304FRIENDS = $SERVICEHOME/friends
305CONFIG = $DEFAULTCONFIG
306BINARY = gnunet-daemon-topology
307
308[hostlist]
309# port for hostlist http server
310HTTPPORT = 8080
311HOME = $SERVICEHOME
312HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
313CONFIG = $DEFAULTCONFIG
314BINARY = gnunet-daemon-hostlist
315# consider having "-e" as default as well once implemented
316OPTIONS = -b
317SERVERS = http://v9.gnunet.org:58080/
318# proxy for downloading hostlists
319HTTP-PROXY =
320
321
322[datastore]
323AUTOSTART = YES
324UNIXPATH = /tmp/gnunet-service-datastore.sock
325UNIX_MATCH_UID = YES
326UNIX_MATCH_GID = YES
327PORT = 2093
328HOSTNAME = localhost
329HOME = $SERVICEHOME
330CONFIG = $DEFAULTCONFIG
331BINARY = gnunet-service-datastore
332ACCEPT_FROM = 127.0.0.1;
333ACCEPT_FROM6 = ::1;
334QUOTA = 100000000
335BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
336DATABASE = sqlite
337# DISABLE_SOCKET_FORWARDING = NO
338
339[datastore-sqlite]
340FILENAME = $SERVICEHOME/datastore/sqlite.db
341
342[datastore-postgres]
343CONFIG = connect_timeout=10; dbname=gnunet
344
345[datastore-mysql]
346DATABASE = gnunet
347CONFIG = ~/.my.cnf
348# USER = gnunet
349# PASSWORD =
350# HOST = localhost
351# PORT = 3306
352
353[datacache-mysql]
354DATABASE = gnunetcheck
355CONFIG = ~/.my.cnf
356# USER = gnunet
357# PASSWORD =
358# HOST = localhost
359# PORT = 3306
360
361
362[fs]
363AUTOSTART = YES
364INDEXDB = $SERVICEHOME/idxinfo.lst
365TRUST = $SERVICEHOME/data/credit/
366IDENTITY_DIR = $SERVICEHOME/identities/
367STATE_DIR = $SERVICEHOME/persistence/
368UPDATE_DIR = $SERVICEHOME/updates/
369PORT = 2094
370HOSTNAME = localhost
371HOME = $SERVICEHOME
372CONFIG = $DEFAULTCONFIG
373BINARY = gnunet-service-fs
374ACCEPT_FROM = 127.0.0.1;
375ACCEPT_FROM6 = ::1;
376
377DELAY = YES
378CONTENT_CACHING = YES
379CONTENT_PUSHING = YES
380
381UNIXPATH = /tmp/gnunet-service-fs.sock
382UNIX_MATCH_UID = NO
383UNIX_MATCH_GID = YES
384# DISABLE_SOCKET_FORWARDING = NO
385# DEBUG = YES
386MAX_PENDING_REQUESTS = 65536
387# Maximum frequency we're allowed to poll the datastore
388# for content for migration (can be used to reduce
389# GNUnet's disk-IO rate)
390MIN_MIGRATION_DELAY = 100
391EXPECTED_NEIGHBOUR_COUNT = 128
392
393[dht]
394AUTOSTART = YES
395PORT = 2095
396HOSTNAME = localhost
397HOME = $SERVICEHOME
398CONFIG = $DEFAULTCONFIG
399BINARY = gnunet-service-dht
400ACCEPT_FROM = 127.0.0.1;
401ACCEPT_FROM6 = ::1;
402BUCKET_SIZE = 4
403UNIXPATH = /tmp/gnunet-service-dht.sock
404UNIX_MATCH_UID = YES
405UNIX_MATCH_GID = YES
406# DISABLE_SOCKET_FORWARDING = NO
407# DEBUG = YES
408# USERNAME =
409# MAXBUF =
410# TIMEOUT =
411# DISABLEV6 =
412# BINDTO =
413# REJECT_FROM =
414# REJECT_FROM6 =
415# PREFIX =
416# DO_FIND_PEER =
417# STRICT_KADEMLIA =
418# USE_MAX_HOPS =
419# MAX_HOPS =
420# REPUBLISH = YES
421# REPLICATION_FREQUENCY = 60
422# STOP_ON_CLOSEST =
423# STOP_FOUND =
424# CONVERGE_MODIFIER =
425
426
427[dhtcache]
428DATABASE = sqlite
429QUOTA = 1024000
430
431[block]
432PLUGINS = fs dht test dns
433
434[mesh]
435AUTOSTART = YES
436PORT = 2096
437HOSTNAME = localhost
438HOME = $SERVICEHOME
439CONFIG = $DEFAULTCONFIG
440BINARY = gnunet-service-mesh
441ACCEPT_FROM = 127.0.0.1;
442ACCEPT_FROM6 = ::1;
443UNIXPATH = /tmp/gnunet-service-mesh.sock
444UNIX_MATCH_UID = YES
445UNIX_MATCH_GID = YES
446
447[nse]
448AUTOSTART = YES
449PORT = 2097
450HOSTNAME = localhost
451HOME = $SERVICEHOME
452CONFIG = $DEFAULTCONFIG
453BINARY = gnunet-service-nse
454ACCEPT_FROM = 127.0.0.1;
455ACCEPT_FROM6 = ::1;
456UNIXPATH = /tmp/test-nse-service-nse.unix
457UNIX_MATCH_UID = YES
458UNIX_MATCH_GID = YES
459PROOFFILE = $SERVICEHOME/.nse-proof
460HISTOGRAM = $SERVICEHOME/nse-history.log
461
462# How 'slowly' should the proof-of-work be constructed (delay
463# between rounds in ms); sane values between 0 and ~1000.
464WORKDELAY = 5
465
466# Note: changing any of the values below will make this peer
467# completely incompatible with other peers!
468INTERVAL = 3600000
469WORKBITS = 20
470
471
472[vpn]
473CONFIG = $DEFAULTCONFIG
474BINARY = gnunet-daemon-vpn
475IPV6ADDR = 1234::1
476IPV6PREFIX = 32
477IPV4ADDR = 10.11.10.1
478IPV4MASK = 255.255.0.0
479VIRTDNS = 10.11.10.2
480VIRTDNS6 = 1234::17
481IFNAME = vpn-gnunet
482
483[exit]
484CONFIG = $DEFAULTCONFIG
485BINARY = gnunet-daemon-exit
486IPV6ADDR = 1234:1::1
487IPV6PREFIX = 32
488IPV4ADDR = 10.10.1.1
489IPV4MASK = 255.255.0.0
490IFNAME = exit-gnunet
491ENABLE_UDP = NO
492ENABLE_TCP = NO
493
494[dns]
495AUTOSTART = YES
496PORT = 0
497HOSTNAME = localhost
498HOME = $SERVICEHOME
499CONFIG = $DEFAULTCONFIG
500BINARY = gnunet-service-dns
501ACCEPT_FROM = 127.0.0.1;
502ACCEPT_FROM6 = ::1;
503UNIXPATH = /tmp/gnunet-service-dns.sock
504PROVIDE_EXIT = NO
505
diff --git a/contrib/test_gnunet_prefix.c b/contrib/test_gnunet_prefix.c
index ea8137107..732e8ebac 100644
--- a/contrib/test_gnunet_prefix.c
+++ b/contrib/test_gnunet_prefix.c
@@ -43,7 +43,7 @@ main (int argc,
43 _("Testcases will not work!\n")); 43 _("Testcases will not work!\n"));
44 return 1; 44 return 1;
45 } 45 }
46 dirname = DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR "defaults.conf"; 46 dirname = DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR "config.d";
47 { 47 {
48 char tmp[strlen (basename) + strlen (dirname) + 1]; 48 char tmp[strlen (basename) + strlen (dirname) + 1];
49 sprintf (tmp, "%s%s", basename, dirname); 49 sprintf (tmp, "%s%s", basename, dirname);
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index bd6e7e0e7..9ed8bbe15 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -1,5 +1,10 @@
1INCLUDES = -I$(top_srcdir)/src/include 1INCLUDES = -I$(top_srcdir)/src/include
2 2
3pkgcfgdir= $(pkgdatadir)/config.d/
4
5dist_pkgcfg_DATA = \
6 arm.conf
7
3if MINGW 8if MINGW
4 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 9 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
5endif 10endif
diff --git a/src/arm/arm.conf b/src/arm/arm.conf
new file mode 100644
index 000000000..beb3d30c8
--- /dev/null
+++ b/src/arm/arm.conf
@@ -0,0 +1,23 @@
1
2[arm]
3PORT = 2087
4HOSTNAME = localhost
5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-arm
8ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1;
10DEFAULTSERVICES = topology hostlist
11UNIXPATH = /tmp/gnunet-service-arm.sock
12UNIX_MATCH_UID = YES
13UNIX_MATCH_GID = YES
14# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
15# GLOBAL_PREFIX =
16# USERNAME =
17# MAXBUF =
18# TIMEOUT =
19# DISABLEV6 =
20# BINDTO =
21# REJECT_FROM =
22# REJECT_FROM6 =
23# PREFIX = \ No newline at end of file
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 5cba4fccb..0db590a81 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -1,5 +1,10 @@
1INCLUDES = -I$(top_srcdir)/src/include 1INCLUDES = -I$(top_srcdir)/src/include
2 2
3pkgcfgdir= $(pkgdatadir)/config.d/
4
5dist_pkgcfg_DATA = \
6 ats.conf
7
3if MINGW 8if MINGW
4 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 9 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
5endif 10endif
diff --git a/src/ats/ats.conf b/src/ats/ats.conf
new file mode 100644
index 000000000..f5d6c7765
--- /dev/null
+++ b/src/ats/ats.conf
@@ -0,0 +1,24 @@
1[ats]
2AUTOSTART = YES
3PORT = 2098
4HOSTNAME = localhost
5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-ats
8ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1;
10UNIXPATH = /tmp/gnunet-service-ats.sock
11UNIX_MATCH_UID = YES
12UNIX_MATCH_GID = YES
13
14TOTAL_QUOTA_IN = 65536
15TOTAL_QUOTA_OUT = 65536
16# ATS options
17DUMP_MLP = NO
18DUMP_SOLUTION = NO
19DUMP_OVERWRITE = NO
20DUMP_MIN_PEERS = 0
21DUMP_MIN_ADDRS = 0
22DUMP_OVERWRITE = NO
23ATS_MIN_INTERVAL = 15000
24ATS_EXEC_INTERVAL = 30000
diff --git a/src/block/Makefile.am b/src/block/Makefile.am
index 452296613..96b66c3ee 100644
--- a/src/block/Makefile.am
+++ b/src/block/Makefile.am
@@ -2,6 +2,11 @@ INCLUDES = -I$(top_srcdir)/src/include
2 2
3plugindir = $(libdir)/gnunet 3plugindir = $(libdir)/gnunet
4 4
5pkgcfgdir= $(pkgdatadir)/config.d/
6
7dist_pkgcfg_DATA = \
8 block.conf
9
5if MINGW 10if MINGW
6 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 11 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
7endif 12endif
diff --git a/src/block/block.conf b/src/block/block.conf
new file mode 100644
index 000000000..dbae438b7
--- /dev/null
+++ b/src/block/block.conf
@@ -0,0 +1,2 @@
1[block]
2PLUGINS = fs dht test dns \ No newline at end of file
diff --git a/src/chat/Makefile.am b/src/chat/Makefile.am
index dcf1f5a2d..859e8f1f1 100644
--- a/src/chat/Makefile.am
+++ b/src/chat/Makefile.am
@@ -1,5 +1,10 @@
1INCLUDES = -I$(top_srcdir)/src/include 1INCLUDES = -I$(top_srcdir)/src/include
2 2
3pkgcfgdir= $(pkgdatadir)/config.d/
4
5dist_pkgcfg_DATA = \
6 chat.conf
7
3if MINGW 8if MINGW
4 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 9 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
5endif 10endif
diff --git a/src/chat/chat.conf b/src/chat/chat.conf
new file mode 100644
index 000000000..61d551e16
--- /dev/null
+++ b/src/chat/chat.conf
@@ -0,0 +1,22 @@
1[chat]
2AUTOSTART = YES
3PORT = 2090
4HOSTNAME = localhost
5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-chat
8ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1;
10UNIXPATH = /tmp/gnunet-service-chat.sock
11UNIX_MATCH_UID = NO
12UNIX_MATCH_GID = YES
13# DISABLE_SOCKET_FORWARDING = NO
14# USERNAME =
15# MAXBUF =
16# TIMEOUT =
17# DISABLEV6 =
18# BINDTO =
19# REJECT_FROM =
20# REJECT_FROM6 =
21# PREFIX =
22
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index b2629a567..13054d15a 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,5 +1,10 @@
1INCLUDES = -I$(top_srcdir)/src/include 1INCLUDES = -I$(top_srcdir)/src/include
2 2
3pkgcfgdir= $(pkgdatadir)/config.d/
4
5dist_pkgcfg_DATA = \
6 core.conf
7
3if MINGW 8if MINGW
4 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 9 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
5endif 10endif
diff --git a/src/core/core.conf b/src/core/core.conf
new file mode 100644
index 000000000..1d7815ad6
--- /dev/null
+++ b/src/core/core.conf
@@ -0,0 +1,25 @@
1[core]
2AUTOSTART = YES
3PORT = 2092
4HOSTNAME = localhost
5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-core
8ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1;
10# quotas are in bytes per second now!
11TOTAL_QUOTA_IN = 65536
12TOTAL_QUOTA_OUT = 65536
13UNIXPATH = /tmp/gnunet-service-core.sock
14UNIX_MATCH_UID = YES
15UNIX_MATCH_GID = YES
16# DISABLE_SOCKET_FORWARDING = NO
17# DEBUG = YES
18# USERNAME =
19# MAXBUF =
20# TIMEOUT =
21# DISABLEV6 =
22# BINDTO =
23# REJECT_FROM =
24# REJECT_FROM6 =
25# PREFIX =
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf
index 5d8da2d34..b3b745095 100644
--- a/src/core/test_core_defaults.conf
+++ b/src/core/test_core_defaults.conf
@@ -43,3 +43,6 @@ AUTOSTART = NO
43 43
44[nse] 44[nse]
45AUTOSTART = NO 45AUTOSTART = NO
46
47[dv]
48AUTOSTART = NO \ No newline at end of file
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index 8e4f265cd..5a3d22bbb 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -2,6 +2,11 @@ INCLUDES = -I$(top_srcdir)/src/include
2 2
3plugindir = $(libdir)/gnunet 3plugindir = $(libdir)/gnunet
4 4
5pkgcfgdir= $(pkgdatadir)/config.d/
6
7dist_pkgcfg_DATA = \
8 datacache.conf
9
5if MINGW 10if MINGW
6 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 11 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
7endif 12endif
diff --git a/src/datacache/datacache.conf b/src/datacache/datacache.conf
new file mode 100644
index 000000000..fb850f39f
--- /dev/null
+++ b/src/datacache/datacache.conf
@@ -0,0 +1,8 @@
1[datacache-mysql]
2DATABASE = gnunetcheck
3CONFIG = ~/.my.cnf
4# USER = gnunet
5# PASSWORD =
6# HOST = localhost
7# PORT = 3306
8
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index cecda89b4..cab08bc0f 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -2,6 +2,11 @@ INCLUDES = -I$(top_srcdir)/src/include
2 2
3plugindir = $(libdir)/gnunet 3plugindir = $(libdir)/gnunet
4 4
5pkgcfgdir= $(pkgdatadir)/config.d/
6
7dist_pkgcfg_DATA = \
8 datastore.conf
9
5if MINGW 10if MINGW
6 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 11 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
7endif 12endif
diff --git a/src/datastore/datastore.conf b/src/datastore/datastore.conf
new file mode 100644
index 000000000..ed44036c7
--- /dev/null
+++ b/src/datastore/datastore.conf
@@ -0,0 +1,33 @@
1[datastore]
2AUTOSTART = YES
3UNIXPATH = /tmp/gnunet-service-datastore.sock
4UNIX_MATCH_UID = YES
5UNIX_MATCH_GID = YES
6PORT = 2093
7HOSTNAME = localhost
8HOME = $SERVICEHOME
9CONFIG = $DEFAULTCONFIG
10BINARY = gnunet-service-datastore
11ACCEPT_FROM = 127.0.0.1;
12ACCEPT_FROM6 = ::1;
13QUOTA = 100000000
14BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
15DATABASE = sqlite
16# DISABLE_SOCKET_FORWARDING = NO
17
18[datastore-sqlite]
19FILENAME = $SERVICEHOME/datastore/sqlite.db
20
21[datastore-postgres]
22CONFIG = connect_timeout=10; dbname=gnunet
23
24[datastore-mysql]
25DATABASE = gnunet
26CONFIG = ~/.my.cnf
27# USER = gnunet
28# PASSWORD =
29# HOST = localhost
30# PORT = 3306
31
32
33
diff --git a/src/datastore/test_defaults.conf b/src/datastore/test_defaults.conf
index 2af5c5315..e2911fc2d 100644
--- a/src/datastore/test_defaults.conf
+++ b/src/datastore/test_defaults.conf
@@ -13,3 +13,6 @@ AUTOSTART = NO
13 13
14[nse] 14[nse]
15AUTOSTART = NO 15AUTOSTART = NO
16
17[dv]
18AUTOSTART = NO \ No newline at end of file
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 952e828d3..ad1d05d25 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -5,6 +5,11 @@ endif
5 5
6plugindir = $(libdir)/gnunet 6plugindir = $(libdir)/gnunet
7 7
8pkgcfgdir= $(pkgdatadir)/config.d/
9
10dist_pkgcfg_DATA = \
11 dht.conf
12
8if HAVE_ZLIB 13if HAVE_ZLIB
9 ZLIB_LNK = -lz 14 ZLIB_LNK = -lz
10endif 15endif
diff --git a/src/dht/dht.conf b/src/dht/dht.conf
new file mode 100644
index 000000000..50c25daac
--- /dev/null
+++ b/src/dht/dht.conf
@@ -0,0 +1,38 @@
1[dht]
2AUTOSTART = YES
3PORT = 2095
4HOSTNAME = localhost
5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-dht
8ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1;
10BUCKET_SIZE = 4
11UNIXPATH = /tmp/gnunet-service-dht.sock
12UNIX_MATCH_UID = YES
13UNIX_MATCH_GID = YES
14# DISABLE_SOCKET_FORWARDING = NO
15# DEBUG = YES
16# USERNAME =
17# MAXBUF =
18# TIMEOUT =
19# DISABLEV6 =
20# BINDTO =
21# REJECT_FROM =
22# REJECT_FROM6 =
23# PREFIX =
24# DO_FIND_PEER =
25# STRICT_KADEMLIA =
26# USE_MAX_HOPS =
27# MAX_HOPS =
28# REPUBLISH = YES
29# REPLICATION_FREQUENCY = 60
30# STOP_ON_CLOSEST =
31# STOP_FOUND =
32# CONVERGE_MODIFIER =
33
34
35[dhtcache]
36DATABASE = sqlite
37QUOTA = 1024000
38
diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am
index d505e31c4..c0e826a2c 100644
--- a/src/dv/Makefile.am
+++ b/src/dv/Makefile.am
@@ -11,6 +11,11 @@ endif
11 11
12plugindir = $(libdir)/gnunet 12plugindir = $(libdir)/gnunet
13 13
14pkgcfgdir= $(pkgdatadir)/config.d/
15
16dist_pkgcfg_DATA = \
17 dv.conf
18
14lib_LTLIBRARIES = libgnunetdv.la 19lib_LTLIBRARIES = libgnunetdv.la
15 20
16plugin_LTLIBRARIES = libgnunet_plugin_transport_dv.la 21plugin_LTLIBRARIES = libgnunet_plugin_transport_dv.la
diff --git a/src/dv/dv.conf b/src/dv/dv.conf
new file mode 100644
index 000000000..8fbf23659
--- /dev/null
+++ b/src/dv/dv.conf
@@ -0,0 +1,15 @@
1[dv]
2AUTOSTART = YES
3DEBUG = NO
4ACCEPT_FROM6 = ::1;
5ACCEPT_FROM = 127.0.0.1;
6BINARY = gnunet-service-dv
7CONFIG = $DEFAULTCONFIG
8HOME = $SERVICEHOME
9HOSTNAME = localhost
10PORT = 2571
11# ACCEPT_FROM =
12# ACCEPT_FROM6 =
13# REJECT_FROM =
14# REJECT_FROM6 =
15# BINDTO =
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 85e3a4539..3e94e9182 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -9,6 +9,11 @@ if USE_COVERAGE
9 XLIB = -lgcov 9 XLIB = -lgcov
10endif 10endif
11 11
12pkgcfgdir= $(pkgdatadir)/config.d/
13
14dist_pkgcfg_DATA = \
15 fs.conf
16
12 17
13lib_LTLIBRARIES = libgnunetfs.la 18lib_LTLIBRARIES = libgnunetfs.la
14 19
diff --git a/src/fs/fs.conf b/src/fs/fs.conf
new file mode 100644
index 000000000..7e3fecd7b
--- /dev/null
+++ b/src/fs/fs.conf
@@ -0,0 +1,32 @@
1[fs]
2AUTOSTART = YES
3INDEXDB = $SERVICEHOME/idxinfo.lst
4TRUST = $SERVICEHOME/data/credit/
5IDENTITY_DIR = $SERVICEHOME/identities/
6STATE_DIR = $SERVICEHOME/persistence/
7UPDATE_DIR = $SERVICEHOME/updates/
8PORT = 2094
9HOSTNAME = localhost
10HOME = $SERVICEHOME
11CONFIG = $DEFAULTCONFIG
12BINARY = gnunet-service-fs
13ACCEPT_FROM = 127.0.0.1;
14ACCEPT_FROM6 = ::1;
15
16DELAY = YES
17CONTENT_CACHING = YES
18CONTENT_PUSHING = YES
19
20UNIXPATH = /tmp/gnunet-service-fs.sock
21UNIX_MATCH_UID = NO
22UNIX_MATCH_GID = YES
23# DISABLE_SOCKET_FORWARDING = NO
24# DEBUG = YES
25MAX_PENDING_REQUESTS = 65536
26# Maximum frequency we're allowed to poll the datastore
27# for content for migration (can be used to reduce
28# GNUnet's disk-IO rate)
29MIN_MIGRATION_DELAY = 100
30EXPECTED_NEIGHBOUR_COUNT = 128
31
32
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index 5e54e15ea..f71a12061 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -71,3 +71,6 @@ AUTOSTART = NO
71 71
72[nse] 72[nse]
73AUTOSTART = NO 73AUTOSTART = NO
74
75[dv]
76AUTOSTART = NO \ No newline at end of file
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 8af1d4a7f..f764f2fbe 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -1,5 +1,10 @@
1INCLUDES = -I$(top_srcdir)/src/include 1INCLUDES = -I$(top_srcdir)/src/include
2 2
3pkgcfgdir= $(pkgdatadir)/config.d/
4
5dist_pkgcfg_DATA = \
6 hostlist.conf
7
3if USE_COVERAGE 8if USE_COVERAGE
4 AM_CFLAGS = --coverage -O0 9 AM_CFLAGS = --coverage -O0
5endif 10endif
diff --git a/src/hostlist/hostlist.conf b/src/hostlist/hostlist.conf
new file mode 100644
index 000000000..3f8c14227
--- /dev/null
+++ b/src/hostlist/hostlist.conf
@@ -0,0 +1,14 @@
1[hostlist]
2# port for hostlist http server
3HTTPPORT = 8080
4HOME = $SERVICEHOME
5HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-daemon-hostlist
8# consider having "-e" as default as well once implemented
9OPTIONS = -b
10SERVERS = http://v9.gnunet.org:58080/
11# proxy for downloading hostlists
12HTTP-PROXY =
13
14
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf
index 473ac2a95..08c58b963 100644
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/src/hostlist/test_hostlist_defaults.conf
@@ -48,3 +48,6 @@ AUTOSTART = NO
48 48
49[dht] 49[dht]
50AUTOSTART = NO 50AUTOSTART = NO
51
52[dv]
53AUTOSTART = NO \ No newline at end of file
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index bfec0d5b4..f6546a586 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -9,6 +9,11 @@ if USE_COVERAGE
9 XLIB = -lgcov 9 XLIB = -lgcov
10endif 10endif
11 11
12pkgcfgdir= $(pkgdatadir)/config.d/
13
14dist_pkgcfg_DATA = \
15 mesh.conf
16
12AM_CLFAGS = -g 17AM_CLFAGS = -g
13 18
14bin_PROGRAMS = \ 19bin_PROGRAMS = \
diff --git a/src/mesh/mesh.conf b/src/mesh/mesh.conf
new file mode 100644
index 000000000..922275368
--- /dev/null
+++ b/src/mesh/mesh.conf
@@ -0,0 +1,13 @@
1[mesh]
2AUTOSTART = YES
3PORT = 2096
4HOSTNAME = localhost
5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-mesh
8ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1;
10UNIXPATH = /tmp/gnunet-service-mesh.sock
11UNIX_MATCH_UID = YES
12UNIX_MATCH_GID = YES
13
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 5adab1ae5..ed3a1545a 100644
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -7,6 +7,11 @@ if MINGW
7 NATCLIENT = gnunet-helper-nat-client-windows.c 7 NATCLIENT = gnunet-helper-nat-client-windows.c
8endif 8endif
9 9
10pkgcfgdir= $(pkgdatadir)/config.d/
11
12dist_pkgcfg_DATA = \
13 nat.conf
14
10 15
11if ENABLE_TEST_RUN 16if ENABLE_TEST_RUN
12 nattest = $(bindir)/gnunet-nat-server 17 nattest = $(bindir)/gnunet-nat-server
diff --git a/src/nat/nat.conf b/src/nat/nat.conf
new file mode 100644
index 000000000..e44612289
--- /dev/null
+++ b/src/nat/nat.conf
@@ -0,0 +1,54 @@
1[nat]
2# Are we behind NAT?
3BEHIND_NAT = NO
4
5# Is the NAT hole-punched?
6PUNCHED_NAT = NO
7
8# Enable UPNP by default?
9ENABLE_UPNP = NO
10
11# Use addresses from the local network interfaces (inluding loopback, but also others)
12USE_LOCALADDR = YES
13
14# Use address obtained from a DNS lookup of our hostname
15USE_HOSTNAME = NO
16
17# External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!)
18# normal interface IP address for non-NATed peers;
19# possibly auto-detected (using UPnP) if possible if not specified
20# EXTERNAL_ADDRESS =
21
22# Should we use ICMP-based NAT traversal to try connect to NATed peers
23# or, if we are behind NAT, to allow connections to us?
24ENABLE_ICMP_CLIENT = NO
25ENABLE_ICMP_SERVER = NO
26
27# IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
28# normal interface IP address for non-NATed peers;
29# likely auto-detected (via interface list) if not specified (!)
30# INTERNAL_ADDRESS =
31
32# Disable IPv6 support
33DISABLEV6 = NO
34
35# Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
36RETURN_LOCAL_ADDRESSES = NO
37
38# How often do we query the DNS resolver
39# for our hostname (to get our own IP), in ms
40HOSTNAME_DNS_FREQUENCY = 1200000
41
42# How often do we iterate over our
43# network interfaces to check for changes
44# in our IP address? in ms
45IFC_SCAN_FREQUENCY = 3000000
46
47# How often do we query the DNS resolver
48# for our hostname (to get our own IP), in ms
49DYNDNS_FREQUENCY = 140000
50
51[gnunet-nat-server]
52HOSTNAME = gnunet.org
53PORT = 5724
54
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index af16a420d..48844bfc0 100644
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -9,6 +9,11 @@ if USE_COVERAGE
9 XLIB = -lgcov 9 XLIB = -lgcov
10endif 10endif
11 11
12pkgcfgdir= $(pkgdatadir)/config.d/
13
14dist_pkgcfg_DATA = \
15 nse.conf
16
12 17
13lib_LTLIBRARIES = libgnunetnse.la 18lib_LTLIBRARIES = libgnunetnse.la
14 19
diff --git a/src/nse/nse.conf b/src/nse/nse.conf
new file mode 100644
index 000000000..318fd15fd
--- /dev/null
+++ b/src/nse/nse.conf
@@ -0,0 +1,24 @@
1[nse]
2AUTOSTART = YES
3PORT = 2097
4HOSTNAME = localhost
5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-nse
8ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1;
10UNIXPATH = /tmp/test-nse-service-nse.unix
11UNIX_MATCH_UID = YES
12UNIX_MATCH_GID = YES
13PROOFFILE = $SERVICEHOME/.nse-proof
14HISTOGRAM = $SERVICEHOME/nse-history.log
15
16# How 'slowly' should the proof-of-work be constructed (delay
17# between rounds in ms); sane values between 0 and ~1000.
18WORKDELAY = 5
19
20# Note: changing any of the values below will make this peer
21# completely incompatible with other peers!
22INTERVAL = 3600000
23WORKBITS = 20
24
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index d58425730..13a763b47 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -1,5 +1,10 @@
1INCLUDES = -I$(top_srcdir)/src/include 1INCLUDES = -I$(top_srcdir)/src/include
2 2
3pkgcfgdir= $(pkgdatadir)/config.d/
4
5dist_pkgcfg_DATA = \
6 peerinfo.conf
7
3if MINGW 8if MINGW
4 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -liconv -lstdc++ -lcomdlg32 -lgdi32 9 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -liconv -lstdc++ -lcomdlg32 -lgdi32
5endif 10endif
diff --git a/src/peerinfo/peerinfo.conf b/src/peerinfo/peerinfo.conf
new file mode 100644
index 000000000..1b300ca4b
--- /dev/null
+++ b/src/peerinfo/peerinfo.conf
@@ -0,0 +1,24 @@
1[peerinfo]
2AUTOSTART = YES
3PORT = 2090
4HOSTNAME = localhost
5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-peerinfo
8ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1;
10UNIXPATH = /tmp/gnunet-service-peerinfo.sock
11UNIX_MATCH_UID = NO
12UNIX_MATCH_GID = YES
13# DISABLE_SOCKET_FORWARDING = NO
14# USERNAME =
15# MAXBUF =
16# TIMEOUT =
17# DISABLEV6 =
18# BINDTO =
19# REJECT_FROM =
20# REJECT_FROM6 =
21# PREFIX =
22HOSTS = $SERVICEHOME/data/hosts/
23
24
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index a15aba9fb..80110bbec 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -9,6 +9,10 @@ if USE_COVERAGE
9 XLIB = -lgcov 9 XLIB = -lgcov
10endif 10endif
11 11
12pkgcfgdir= $(pkgdatadir)/config.d/
13
14dist_pkgcfg_DATA = \
15 statistics.conf
12 16
13lib_LTLIBRARIES = libgnunetstatistics.la 17lib_LTLIBRARIES = libgnunetstatistics.la
14 18
diff --git a/src/statistics/statistics.conf b/src/statistics/statistics.conf
new file mode 100644
index 000000000..e54c51963
--- /dev/null
+++ b/src/statistics/statistics.conf
@@ -0,0 +1,22 @@
1[statistics]
2AUTOSTART = YES
3PORT = 2088
4HOSTNAME = localhost
5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-statistics
8ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1;
10UNIXPATH = /tmp/gnunet-service-statistics.sock
11UNIX_MATCH_UID = NO
12UNIX_MATCH_GID = YES
13# DISABLE_SOCKET_FORWARDING = NO
14# USERNAME =
15# MAXBUF =
16# TIMEOUT =
17# DISABLEV6 =
18# BINDTO =
19# REJECT_FROM =
20# REJECT_FROM6 =
21# PREFIX =
22
diff --git a/src/template/Makefile.am b/src/template/Makefile.am
index 35a4b433e..1769191e7 100644
--- a/src/template/Makefile.am
+++ b/src/template/Makefile.am
@@ -1,5 +1,10 @@
1INCLUDES = -I$(top_srcdir)/src/include 1INCLUDES = -I$(top_srcdir)/src/include
2 2
3pkgcfgdir= $(pkgdatadir)/config.d/
4
5dist_pkgcfg_DATA = \
6 template.conf
7
3if MINGW 8if MINGW
4 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 9 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
5endif 10endif
diff --git a/src/template/template.conf b/src/template/template.conf
new file mode 100644
index 000000000..522721fb6
--- /dev/null
+++ b/src/template/template.conf
@@ -0,0 +1,21 @@
1[template]
2AUTOSTART = NO
3PORT = 9999
4HOSTNAME = localhost
5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-template
8ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1;
10UNIXPATH = /tmp/gnunet-service-template.sock
11UNIX_MATCH_UID = YES
12UNIX_MATCH_GID = YES
13# DISABLE_SOCKET_FORWARDING = NO
14# USERNAME =
15# MAXBUF =
16# TIMEOUT =
17# DISABLEV6 =
18# BINDTO =
19# REJECT_FROM =
20# REJECT_FROM6 =
21# PREFIX =
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 7e594e46e..88102e112 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -9,6 +9,11 @@ if USE_COVERAGE
9 XLIB = -lgcov 9 XLIB = -lgcov
10endif 10endif
11 11
12pkgcfgdir= $(pkgdatadir)/config.d/
13
14dist_pkgcfg_DATA = \
15 testing.conf
16
12if HAVE_EXPENSIVE_TESTS 17if HAVE_EXPENSIVE_TESTS
13 EXPENSIVE_TESTS = \ 18 EXPENSIVE_TESTS = \
14 test_testing_topology_stability \ 19 test_testing_topology_stability \
diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf
index 5195882b4..c4810c303 100644
--- a/src/testing/test_testing_defaults.conf
+++ b/src/testing/test_testing_defaults.conf
@@ -58,3 +58,6 @@ AUTOSTART = NO
58 58
59[fs] 59[fs]
60AUTOSTART = NO 60AUTOSTART = NO
61
62[dv]
63AUTOSTART = NO
diff --git a/src/testing/testing.conf b/src/testing/testing.conf
new file mode 100644
index 000000000..1604ebc3a
--- /dev/null
+++ b/src/testing/testing.conf
@@ -0,0 +1,11 @@
1[TESTING]
2# How long before failing a connection?
3CONNECT_TIMEOUT = 30
4# How many connect attempts should we make?
5CONNECT_ATTEMPTS = 3
6# How many connections can happen simultaneously?
7MAX_OUTSTANDING_CONNECTIONS = 50
8
9# Should we clean up the files on peer group shutdown?
10DELETE_FILES = YES
11
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
index 3b69627e3..261be8619 100644
--- a/src/topology/Makefile.am
+++ b/src/topology/Makefile.am
@@ -4,6 +4,11 @@ if USE_COVERAGE
4 AM_CFLAGS = --coverage -O0 4 AM_CFLAGS = --coverage -O0
5endif 5endif
6 6
7pkgcfgdir= $(pkgdatadir)/config.d/
8
9dist_pkgcfg_DATA = \
10 topology.conf
11
7 12
8bin_PROGRAMS = \ 13bin_PROGRAMS = \
9 gnunet-daemon-topology 14 gnunet-daemon-topology
diff --git a/src/topology/topology.conf b/src/topology/topology.conf
new file mode 100644
index 000000000..39f29219d
--- /dev/null
+++ b/src/topology/topology.conf
@@ -0,0 +1,10 @@
1[topology]
2MINIMUM-FRIENDS = 0
3FRIENDS-ONLY = NO
4AUTOCONNECT = YES
5TARGET-CONNECTION-COUNT = 16
6FRIENDS = $SERVICEHOME/friends
7CONFIG = $DEFAULTCONFIG
8BINARY = gnunet-daemon-topology
9
10
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 110b43cdf..e5230410c 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -2,6 +2,11 @@ INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
2 2
3plugindir = $(libdir)/gnunet 3plugindir = $(libdir)/gnunet
4 4
5pkgcfgdir= $(pkgdatadir)/config.d/
6
7dist_pkgcfg_DATA = \
8 transport.conf
9
5 10
6if HAVE_MHD 11if HAVE_MHD
7 GN_LIBMHD = -lmicrohttpd 12 GN_LIBMHD = -lmicrohttpd
diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf
index e2e03a0a9..60a65dec5 100644
--- a/src/transport/test_transport_defaults.conf
+++ b/src/transport/test_transport_defaults.conf
@@ -32,6 +32,9 @@ AUTOSTART = NO
32[dns] 32[dns]
33AUTOSTART = NO 33AUTOSTART = NO
34 34
35[dv]
36AUTOSTART = NO
37
35[nat] 38[nat]
36DISABLEV6 = YES 39DISABLEV6 = YES
37BINDTO = 127.0.0.1 40BINDTO = 127.0.0.1
diff --git a/src/transport/transport.conf b/src/transport/transport.conf
new file mode 100644
index 000000000..ded8e304d
--- /dev/null
+++ b/src/transport/transport.conf
@@ -0,0 +1,66 @@
1[transport]
2AUTOSTART = YES
3PORT = 2091
4HOSTNAME = localhost
5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-transport
8#PREFIX = valgrind
9NEIGHBOUR_LIMIT = 50
10ACCEPT_FROM = 127.0.0.1;
11ACCEPT_FROM6 = ::1;
12PLUGINS = tcp
13UNIXPATH = /tmp/gnunet-service-transport.sock
14BLACKLIST_FILE = $SERVICEHOME/blacklist
15UNIX_MATCH_UID = YES
16UNIX_MATCH_GID = YES
17# DISABLE_SOCKET_FORWARDING = NO
18# USERNAME =
19# MAXBUF =
20# TIMEOUT =
21# DISABLEV6 =
22# BINDTO =
23# REJECT_FROM =
24# REJECT_FROM6 =
25# PREFIX =
26
27[transport-tcp]
28# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
29PORT = 2086
30ADVERTISED_PORT = 2086
31
32# Maximum number of open TCP connections allowed
33MAX_CONNECTIONS = 128
34
35TIMEOUT = 5000
36# ACCEPT_FROM =
37# ACCEPT_FROM6 =
38# REJECT_FROM =
39# REJECT_FROM6 =
40# BINDTO =
41MAX_CONNECTIONS = 128
42
43[transport-udp]
44PORT = 2086
45#BROADCAST = YES
46#BROADCAST_PORT = 20089
47#BROADCAST_INTERVAL = 30000
48MAX_BPS = 1000000
49
50[transport-http]
51PORT = 1080
52MAX_CONNECTIONS = 128
53
54[transport-https]
55PORT = 4433
56CRYPTO_INIT = NORMAL
57KEY_FILE = https.key
58CERT_FILE = https.cert
59MAX_CONNECTIONS = 128
60
61[transport-wlan]
62# Name of the interface in monitor mode (typically monX)
63INTERFACE = mon0
64# Real hardware, no testing
65TESTMODE = 0
66
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index d816bc42c..98af8383a 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -2,6 +2,11 @@ INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
2 2
3plugindir = $(libdir)/gnunet 3plugindir = $(libdir)/gnunet
4 4
5pkgcfgdir= $(pkgdatadir)/config.d/
6
7dist_pkgcfg_DATA = \
8 util.conf resolver.conf
9
5if MINGW 10if MINGW
6noinst_LTLIBRARIES = \ 11noinst_LTLIBRARIES = \
7 libgnunetutilwin.la 12 libgnunetutilwin.la
diff --git a/src/util/configuration.c b/src/util/configuration.c
index adfd4ea5a..a269ed036 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -1215,6 +1215,25 @@ GNUNET_CONFIGURATION_remove_value_filename (struct GNUNET_CONFIGURATION_Handle
1215 1215
1216 1216
1217/** 1217/**
1218 * Wrapper around GNUNET_CONFIGURATION_parse.
1219 *
1220 * @param cls the cfg
1221 * @param filename file to parse
1222 * @return GNUNET_OK on success
1223 */
1224static int
1225parse_configuration_file (void *cls,
1226 const char *filename)
1227{
1228 struct GNUNET_CONFIGURATION_Handle *cfg = cls;
1229 int ret;
1230
1231 ret = GNUNET_CONFIGURATION_parse (cfg, filename);
1232 return ret;
1233}
1234
1235
1236/**
1218 * Load configuration (starts with defaults, then loads 1237 * Load configuration (starts with defaults, then loads
1219 * system-specific configuration). 1238 * system-specific configuration).
1220 * 1239 *
@@ -1233,17 +1252,24 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
1233 if (ipath == NULL) 1252 if (ipath == NULL)
1234 return GNUNET_SYSERR; 1253 return GNUNET_SYSERR;
1235 baseconfig = NULL; 1254 baseconfig = NULL;
1236 GNUNET_asprintf (&baseconfig, "%s%s%s", ipath, DIR_SEPARATOR_STR, 1255 GNUNET_asprintf (&baseconfig, "%s%s", ipath,
1237 "defaults.conf"); 1256 "config.d");
1238 GNUNET_free (ipath); 1257 GNUNET_free (ipath);
1239 if ((GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, baseconfig)) || 1258 if (GNUNET_SYSERR ==
1240 (!((filename == NULL) || 1259 GNUNET_DISK_directory_scan (baseconfig,
1241 (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, filename))))) 1260 &parse_configuration_file,
1242 { 1261 cfg))
1243 GNUNET_free (baseconfig); 1262 {
1244 return (filename == NULL) ? GNUNET_OK : GNUNET_SYSERR; 1263 GNUNET_free (baseconfig);
1245 } 1264 return GNUNET_SYSERR; /* no configuration at all found */
1246 GNUNET_free (baseconfig); 1265 }
1266 GNUNET_free (baseconfig);
1267 if ( (filename != NULL) &&
1268 (GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, filename)) )
1269 {
1270 /* specified configuration not found */
1271 return GNUNET_SYSERR;
1272 }
1247 if (((GNUNET_YES != 1273 if (((GNUNET_YES !=
1248 GNUNET_CONFIGURATION_have_value (cfg, "PATHS", "DEFAULTCONFIG"))) && 1274 GNUNET_CONFIGURATION_have_value (cfg, "PATHS", "DEFAULTCONFIG"))) &&
1249 (filename != NULL)) 1275 (filename != NULL))
diff --git a/src/util/disk.c b/src/util/disk.c
index 2021d6493..12f985791 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -795,6 +795,7 @@ GNUNET_DISK_fn_write (const char *fn, const void *buffer, size_t n,
795 return ret; 795 return ret;
796} 796}
797 797
798
798/** 799/**
799 * Scan a directory for files. 800 * Scan a directory for files.
800 * 801 *
diff --git a/src/util/resolver.conf b/src/util/resolver.conf
new file mode 100644
index 000000000..a2690fcc3
--- /dev/null
+++ b/src/util/resolver.conf
@@ -0,0 +1,22 @@
1[resolver]
2AUTOSTART = YES
3PORT = 2089
4HOSTNAME = localhost
5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-resolver
8ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1;
10UNIXPATH = /tmp/gnunet-service-resolver.sock
11UNIX_MATCH_UID = NO
12UNIX_MATCH_GID = NO
13# DISABLE_SOCKET_FORWARDING = NO
14# USERNAME =
15# MAXBUF =
16# TIMEOUT =
17# DISABLEV6 =
18# BINDTO =
19# REJECT_FROM =
20# REJECT_FROM6 =
21# PREFIX =
22
diff --git a/src/util/util.conf b/src/util/util.conf
new file mode 100644
index 000000000..ba9dfec70
--- /dev/null
+++ b/src/util/util.conf
@@ -0,0 +1,16 @@
1[PATHS]
2SERVICEHOME = ~/.gnunet/
3# SERVICEHOME = /var/lib/gnunet/
4# DEFAULTCONFIG = /etc/gnunet.conf
5# If 'DEFAULTCONFIG' is not defined, the current
6# configuration file is assumed to be the default,
7# which is what we want by default...
8
9[gnunetd]
10HOSTKEY = $SERVICEHOME/.hostkey
11
12[client]
13HOME = $SERVICEHOME
14
15[TESTING]
16WEAKRANDOM = NO
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index d0abc6522..c6b390aca 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -8,6 +8,11 @@ if USE_COVERAGE
8 AM_CFLAGS = --coverage -O0 8 AM_CFLAGS = --coverage -O0
9endif 9endif
10 10
11pkgcfgdir= $(pkgdatadir)/config.d/
12
13dist_pkgcfg_DATA = \
14 vpn.conf
15
11if LINUX 16if LINUX
12VPNBIN = gnunet-helper-vpn 17VPNBIN = gnunet-helper-vpn
13HIJACKBIN = gnunet-helper-hijack-dns 18HIJACKBIN = gnunet-helper-hijack-dns
diff --git a/src/vpn/vpn.conf b/src/vpn/vpn.conf
new file mode 100644
index 000000000..0baaa838a
--- /dev/null
+++ b/src/vpn/vpn.conf
@@ -0,0 +1,33 @@
1[vpn]
2CONFIG = $DEFAULTCONFIG
3BINARY = gnunet-daemon-vpn
4IPV6ADDR = 1234::1
5IPV6PREFIX = 32
6IPV4ADDR = 10.11.10.1
7IPV4MASK = 255.255.0.0
8VIRTDNS = 10.11.10.2
9VIRTDNS6 = 1234::17
10IFNAME = vpn-gnunet
11
12[exit]
13CONFIG = $DEFAULTCONFIG
14BINARY = gnunet-daemon-exit
15IPV6ADDR = 1234:1::1
16IPV6PREFIX = 32
17IPV4ADDR = 10.10.1.1
18IPV4MASK = 255.255.0.0
19IFNAME = exit-gnunet
20ENABLE_UDP = NO
21ENABLE_TCP = NO
22
23[dns]
24AUTOSTART = YES
25PORT = 0
26HOSTNAME = localhost
27HOME = $SERVICEHOME
28CONFIG = $DEFAULTCONFIG
29BINARY = gnunet-service-dns
30ACCEPT_FROM = 127.0.0.1;
31ACCEPT_FROM6 = ::1;
32UNIXPATH = /tmp/gnunet-service-dns.sock
33PROVIDE_EXIT = NO