diff options
57 files changed, 720 insertions, 520 deletions
@@ -123,8 +123,8 @@ The defaults that are shipped with the installation are usually ok, | |||
123 | you may want to adjust the limitations (space consumption, bandwidth, | 123 | you may want to adjust the limitations (space consumption, bandwidth, |
124 | etc.) though. The configuration files are human-readable. Note that | 124 | etc.) though. The configuration files are human-readable. Note that |
125 | you MUST create "~/.gnunet/gnunet.conf" explicitly before starting | 125 | you MUST create "~/.gnunet/gnunet.conf" explicitly before starting |
126 | GNUnet. You can either copy "defaults.conf" or simply create an empty | 126 | GNUnet. You can either run gnunet-setup (available as part of the |
127 | file. | 127 | gnunet-gtk source package) or simply create an empty file. |
128 | 128 | ||
129 | 129 | ||
130 | Usage | 130 | Usage |
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 | ||
16 | dist_pkgdata_DATA = \ | 16 | dist_pkgdata_DATA = \ |
17 | gnunet-logo-color.png \ | 17 | gnunet-logo-color.png |
18 | defaults.conf | ||
19 | 18 | ||
20 | EXTRA_DIST = \ | 19 | EXTRA_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] | ||
2 | SERVICEHOME = ~/.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] | ||
10 | HOSTKEY = $SERVICEHOME/.hostkey | ||
11 | |||
12 | [TESTING] | ||
13 | WEAKRANDOM = NO | ||
14 | # How long before failing a connection? | ||
15 | CONNECT_TIMEOUT = 30 | ||
16 | # How many connect attempts should we make? | ||
17 | CONNECT_ATTEMPTS = 3 | ||
18 | # How many connections can happen simultaneously? | ||
19 | MAX_OUTSTANDING_CONNECTIONS = 50 | ||
20 | |||
21 | # Should we clean up the files on peer group shutdown? | ||
22 | DELETE_FILES = YES | ||
23 | |||
24 | [client] | ||
25 | HOME = $SERVICEHOME | ||
26 | |||
27 | [nat] | ||
28 | # Are we behind NAT? | ||
29 | BEHIND_NAT = NO | ||
30 | |||
31 | # Is the NAT hole-punched? | ||
32 | PUNCHED_NAT = NO | ||
33 | |||
34 | # Enable UPNP by default? | ||
35 | ENABLE_UPNP = NO | ||
36 | |||
37 | # Use addresses from the local network interfaces (inluding loopback, but also others) | ||
38 | USE_LOCALADDR = YES | ||
39 | |||
40 | # Use address obtained from a DNS lookup of our hostname | ||
41 | USE_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? | ||
50 | ENABLE_ICMP_CLIENT = NO | ||
51 | ENABLE_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 | ||
59 | DISABLEV6 = NO | ||
60 | |||
61 | # How often do we query the DNS resolver | ||
62 | # for our hostname (to get our own IP), in ms | ||
63 | HOSTNAME_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 | ||
68 | IFC_SCAN_FREQUENCY = 3000000 | ||
69 | |||
70 | # How often do we query the DNS resolver | ||
71 | # for our hostname (to get our own IP), in ms | ||
72 | DYNDNS_FREQUENCY = 140000 | ||
73 | |||
74 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) | ||
75 | RETURN_LOCAL_ADDRESSES = NO | ||
76 | |||
77 | [gnunet-nat-server] | ||
78 | HOSTNAME = gnunet.org | ||
79 | PORT = 5724 | ||
80 | |||
81 | [transport-tcp] | ||
82 | # Use 0 to ONLY advertise as a peer behind NAT (no port binding) | ||
83 | PORT = 2086 | ||
84 | ADVERTISED_PORT = 2086 | ||
85 | |||
86 | # Maximum number of open TCP connections allowed | ||
87 | MAX_CONNECTIONS = 128 | ||
88 | |||
89 | TIMEOUT = 5000 | ||
90 | |||
91 | # ACCEPT_FROM = | ||
92 | # ACCEPT_FROM6 = | ||
93 | # REJECT_FROM = | ||
94 | # REJECT_FROM6 = | ||
95 | # BINDTO = | ||
96 | |||
97 | MAX_CONNECTIONS = 128 | ||
98 | |||
99 | |||
100 | [transport-udp] | ||
101 | PORT = 2086 | ||
102 | #BROADCAST = YES | ||
103 | #BROADCAST_PORT = 20089 | ||
104 | #BROADCAST_INTERVAL = 30000 | ||
105 | |||
106 | |||
107 | MAX_BPS = 1000000 | ||
108 | |||
109 | |||
110 | [transport-http] | ||
111 | PORT = 1080 | ||
112 | MAX_CONNECTIONS = 128 | ||
113 | |||
114 | [transport-https] | ||
115 | PORT = 4433 | ||
116 | CRYPTO_INIT = NORMAL | ||
117 | KEY_FILE = https.key | ||
118 | CERT_FILE = https.cert | ||
119 | MAX_CONNECTIONS = 128 | ||
120 | |||
121 | |||
122 | [transport-wlan] | ||
123 | # Name of the interface in monitor mode (typically monX) | ||
124 | INTERFACE = mon0 | ||
125 | # Real hardware, no testing | ||
126 | TESTMODE = 0 | ||
127 | |||
128 | |||
129 | [arm] | ||
130 | PORT = 2087 | ||
131 | HOSTNAME = localhost | ||
132 | HOME = $SERVICEHOME | ||
133 | CONFIG = $DEFAULTCONFIG | ||
134 | BINARY = gnunet-service-arm | ||
135 | ACCEPT_FROM = 127.0.0.1; | ||
136 | ACCEPT_FROM6 = ::1; | ||
137 | DEFAULTSERVICES = topology hostlist | ||
138 | UNIXPATH = /tmp/gnunet-service-arm.sock | ||
139 | UNIX_MATCH_UID = YES | ||
140 | UNIX_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] | ||
153 | AUTOSTART = YES | ||
154 | PORT = 2088 | ||
155 | HOSTNAME = localhost | ||
156 | HOME = $SERVICEHOME | ||
157 | CONFIG = $DEFAULTCONFIG | ||
158 | BINARY = gnunet-service-statistics | ||
159 | ACCEPT_FROM = 127.0.0.1; | ||
160 | ACCEPT_FROM6 = ::1; | ||
161 | UNIXPATH = /tmp/gnunet-service-statistics.sock | ||
162 | UNIX_MATCH_UID = NO | ||
163 | UNIX_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] | ||
175 | AUTOSTART = YES | ||
176 | PORT = 2089 | ||
177 | HOSTNAME = localhost | ||
178 | HOME = $SERVICEHOME | ||
179 | CONFIG = $DEFAULTCONFIG | ||
180 | BINARY = gnunet-service-resolver | ||
181 | ACCEPT_FROM = 127.0.0.1; | ||
182 | ACCEPT_FROM6 = ::1; | ||
183 | UNIXPATH = /tmp/gnunet-service-resolver.sock | ||
184 | UNIX_MATCH_UID = NO | ||
185 | UNIX_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] | ||
197 | AUTOSTART = YES | ||
198 | PORT = 2090 | ||
199 | HOSTNAME = localhost | ||
200 | HOME = $SERVICEHOME | ||
201 | CONFIG = $DEFAULTCONFIG | ||
202 | BINARY = gnunet-service-peerinfo | ||
203 | ACCEPT_FROM = 127.0.0.1; | ||
204 | ACCEPT_FROM6 = ::1; | ||
205 | UNIXPATH = /tmp/gnunet-service-peerinfo.sock | ||
206 | UNIX_MATCH_UID = NO | ||
207 | UNIX_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 = | ||
217 | HOSTS = $SERVICEHOME/data/hosts/ | ||
218 | |||
219 | |||
220 | [transport] | ||
221 | AUTOSTART = YES | ||
222 | PORT = 2091 | ||
223 | HOSTNAME = localhost | ||
224 | HOME = $SERVICEHOME | ||
225 | CONFIG = $DEFAULTCONFIG | ||
226 | BINARY = gnunet-service-transport | ||
227 | #PREFIX = valgrind | ||
228 | NEIGHBOUR_LIMIT = 50 | ||
229 | ACCEPT_FROM = 127.0.0.1; | ||
230 | ACCEPT_FROM6 = ::1; | ||
231 | PLUGINS = tcp | ||
232 | UNIXPATH = /tmp/gnunet-service-transport.sock | ||
233 | BLACKLIST_FILE = $SERVICEHOME/blacklist | ||
234 | UNIX_MATCH_UID = YES | ||
235 | UNIX_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] | ||
247 | AUTOSTART = YES | ||
248 | PORT = 2098 | ||
249 | HOSTNAME = localhost | ||
250 | HOME = $SERVICEHOME | ||
251 | CONFIG = $DEFAULTCONFIG | ||
252 | BINARY = gnunet-service-ats | ||
253 | ACCEPT_FROM = 127.0.0.1; | ||
254 | ACCEPT_FROM6 = ::1; | ||
255 | UNIXPATH = /tmp/gnunet-service-ats.sock | ||
256 | UNIX_MATCH_UID = YES | ||
257 | UNIX_MATCH_GID = YES | ||
258 | |||
259 | TOTAL_QUOTA_IN = 65536 | ||
260 | TOTAL_QUOTA_OUT = 65536 | ||
261 | # ATS options | ||
262 | DUMP_MLP = NO | ||
263 | DUMP_SOLUTION = NO | ||
264 | DUMP_OVERWRITE = NO | ||
265 | DUMP_MIN_PEERS = 0 | ||
266 | DUMP_MIN_ADDRS = 0 | ||
267 | DUMP_OVERWRITE = NO | ||
268 | ATS_MIN_INTERVAL = 15000 | ||
269 | ATS_EXEC_INTERVAL = 30000 | ||
270 | |||
271 | |||
272 | [core] | ||
273 | AUTOSTART = YES | ||
274 | PORT = 2092 | ||
275 | HOSTNAME = localhost | ||
276 | HOME = $SERVICEHOME | ||
277 | CONFIG = $DEFAULTCONFIG | ||
278 | BINARY = gnunet-service-core | ||
279 | ACCEPT_FROM = 127.0.0.1; | ||
280 | ACCEPT_FROM6 = ::1; | ||
281 | # quotas are in bytes per second now! | ||
282 | TOTAL_QUOTA_IN = 65536 | ||
283 | TOTAL_QUOTA_OUT = 65536 | ||
284 | UNIXPATH = /tmp/gnunet-service-core.sock | ||
285 | UNIX_MATCH_UID = YES | ||
286 | UNIX_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] | ||
300 | MINIMUM-FRIENDS = 0 | ||
301 | FRIENDS-ONLY = NO | ||
302 | AUTOCONNECT = YES | ||
303 | TARGET-CONNECTION-COUNT = 16 | ||
304 | FRIENDS = $SERVICEHOME/friends | ||
305 | CONFIG = $DEFAULTCONFIG | ||
306 | BINARY = gnunet-daemon-topology | ||
307 | |||
308 | [hostlist] | ||
309 | # port for hostlist http server | ||
310 | HTTPPORT = 8080 | ||
311 | HOME = $SERVICEHOME | ||
312 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | ||
313 | CONFIG = $DEFAULTCONFIG | ||
314 | BINARY = gnunet-daemon-hostlist | ||
315 | # consider having "-e" as default as well once implemented | ||
316 | OPTIONS = -b | ||
317 | SERVERS = http://v9.gnunet.org:58080/ | ||
318 | # proxy for downloading hostlists | ||
319 | HTTP-PROXY = | ||
320 | |||
321 | |||
322 | [datastore] | ||
323 | AUTOSTART = YES | ||
324 | UNIXPATH = /tmp/gnunet-service-datastore.sock | ||
325 | UNIX_MATCH_UID = YES | ||
326 | UNIX_MATCH_GID = YES | ||
327 | PORT = 2093 | ||
328 | HOSTNAME = localhost | ||
329 | HOME = $SERVICEHOME | ||
330 | CONFIG = $DEFAULTCONFIG | ||
331 | BINARY = gnunet-service-datastore | ||
332 | ACCEPT_FROM = 127.0.0.1; | ||
333 | ACCEPT_FROM6 = ::1; | ||
334 | QUOTA = 100000000 | ||
335 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | ||
336 | DATABASE = sqlite | ||
337 | # DISABLE_SOCKET_FORWARDING = NO | ||
338 | |||
339 | [datastore-sqlite] | ||
340 | FILENAME = $SERVICEHOME/datastore/sqlite.db | ||
341 | |||
342 | [datastore-postgres] | ||
343 | CONFIG = connect_timeout=10; dbname=gnunet | ||
344 | |||
345 | [datastore-mysql] | ||
346 | DATABASE = gnunet | ||
347 | CONFIG = ~/.my.cnf | ||
348 | # USER = gnunet | ||
349 | # PASSWORD = | ||
350 | # HOST = localhost | ||
351 | # PORT = 3306 | ||
352 | |||
353 | [datacache-mysql] | ||
354 | DATABASE = gnunetcheck | ||
355 | CONFIG = ~/.my.cnf | ||
356 | # USER = gnunet | ||
357 | # PASSWORD = | ||
358 | # HOST = localhost | ||
359 | # PORT = 3306 | ||
360 | |||
361 | |||
362 | [fs] | ||
363 | AUTOSTART = YES | ||
364 | INDEXDB = $SERVICEHOME/idxinfo.lst | ||
365 | TRUST = $SERVICEHOME/data/credit/ | ||
366 | IDENTITY_DIR = $SERVICEHOME/identities/ | ||
367 | STATE_DIR = $SERVICEHOME/persistence/ | ||
368 | UPDATE_DIR = $SERVICEHOME/updates/ | ||
369 | PORT = 2094 | ||
370 | HOSTNAME = localhost | ||
371 | HOME = $SERVICEHOME | ||
372 | CONFIG = $DEFAULTCONFIG | ||
373 | BINARY = gnunet-service-fs | ||
374 | ACCEPT_FROM = 127.0.0.1; | ||
375 | ACCEPT_FROM6 = ::1; | ||
376 | |||
377 | DELAY = YES | ||
378 | CONTENT_CACHING = YES | ||
379 | CONTENT_PUSHING = YES | ||
380 | |||
381 | UNIXPATH = /tmp/gnunet-service-fs.sock | ||
382 | UNIX_MATCH_UID = NO | ||
383 | UNIX_MATCH_GID = YES | ||
384 | # DISABLE_SOCKET_FORWARDING = NO | ||
385 | # DEBUG = YES | ||
386 | MAX_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) | ||
390 | MIN_MIGRATION_DELAY = 100 | ||
391 | EXPECTED_NEIGHBOUR_COUNT = 128 | ||
392 | |||
393 | [dht] | ||
394 | AUTOSTART = YES | ||
395 | PORT = 2095 | ||
396 | HOSTNAME = localhost | ||
397 | HOME = $SERVICEHOME | ||
398 | CONFIG = $DEFAULTCONFIG | ||
399 | BINARY = gnunet-service-dht | ||
400 | ACCEPT_FROM = 127.0.0.1; | ||
401 | ACCEPT_FROM6 = ::1; | ||
402 | BUCKET_SIZE = 4 | ||
403 | UNIXPATH = /tmp/gnunet-service-dht.sock | ||
404 | UNIX_MATCH_UID = YES | ||
405 | UNIX_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] | ||
428 | DATABASE = sqlite | ||
429 | QUOTA = 1024000 | ||
430 | |||
431 | [block] | ||
432 | PLUGINS = fs dht test dns | ||
433 | |||
434 | [mesh] | ||
435 | AUTOSTART = YES | ||
436 | PORT = 2096 | ||
437 | HOSTNAME = localhost | ||
438 | HOME = $SERVICEHOME | ||
439 | CONFIG = $DEFAULTCONFIG | ||
440 | BINARY = gnunet-service-mesh | ||
441 | ACCEPT_FROM = 127.0.0.1; | ||
442 | ACCEPT_FROM6 = ::1; | ||
443 | UNIXPATH = /tmp/gnunet-service-mesh.sock | ||
444 | UNIX_MATCH_UID = YES | ||
445 | UNIX_MATCH_GID = YES | ||
446 | |||
447 | [nse] | ||
448 | AUTOSTART = YES | ||
449 | PORT = 2097 | ||
450 | HOSTNAME = localhost | ||
451 | HOME = $SERVICEHOME | ||
452 | CONFIG = $DEFAULTCONFIG | ||
453 | BINARY = gnunet-service-nse | ||
454 | ACCEPT_FROM = 127.0.0.1; | ||
455 | ACCEPT_FROM6 = ::1; | ||
456 | UNIXPATH = /tmp/test-nse-service-nse.unix | ||
457 | UNIX_MATCH_UID = YES | ||
458 | UNIX_MATCH_GID = YES | ||
459 | PROOFFILE = $SERVICEHOME/.nse-proof | ||
460 | HISTOGRAM = $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. | ||
464 | WORKDELAY = 5 | ||
465 | |||
466 | # Note: changing any of the values below will make this peer | ||
467 | # completely incompatible with other peers! | ||
468 | INTERVAL = 3600000 | ||
469 | WORKBITS = 20 | ||
470 | |||
471 | |||
472 | [vpn] | ||
473 | CONFIG = $DEFAULTCONFIG | ||
474 | BINARY = gnunet-daemon-vpn | ||
475 | IPV6ADDR = 1234::1 | ||
476 | IPV6PREFIX = 32 | ||
477 | IPV4ADDR = 10.11.10.1 | ||
478 | IPV4MASK = 255.255.0.0 | ||
479 | VIRTDNS = 10.11.10.2 | ||
480 | VIRTDNS6 = 1234::17 | ||
481 | IFNAME = vpn-gnunet | ||
482 | |||
483 | [exit] | ||
484 | CONFIG = $DEFAULTCONFIG | ||
485 | BINARY = gnunet-daemon-exit | ||
486 | IPV6ADDR = 1234:1::1 | ||
487 | IPV6PREFIX = 32 | ||
488 | IPV4ADDR = 10.10.1.1 | ||
489 | IPV4MASK = 255.255.0.0 | ||
490 | IFNAME = exit-gnunet | ||
491 | ENABLE_UDP = NO | ||
492 | ENABLE_TCP = NO | ||
493 | |||
494 | [dns] | ||
495 | AUTOSTART = YES | ||
496 | PORT = 0 | ||
497 | HOSTNAME = localhost | ||
498 | HOME = $SERVICEHOME | ||
499 | CONFIG = $DEFAULTCONFIG | ||
500 | BINARY = gnunet-service-dns | ||
501 | ACCEPT_FROM = 127.0.0.1; | ||
502 | ACCEPT_FROM6 = ::1; | ||
503 | UNIXPATH = /tmp/gnunet-service-dns.sock | ||
504 | PROVIDE_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 @@ | |||
1 | INCLUDES = -I$(top_srcdir)/src/include | 1 | INCLUDES = -I$(top_srcdir)/src/include |
2 | 2 | ||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
4 | |||
5 | dist_pkgcfg_DATA = \ | ||
6 | arm.conf | ||
7 | |||
3 | if MINGW | 8 | if MINGW |
4 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 9 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
5 | endif | 10 | endif |
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] | ||
3 | PORT = 2087 | ||
4 | HOSTNAME = localhost | ||
5 | HOME = $SERVICEHOME | ||
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-arm | ||
8 | ACCEPT_FROM = 127.0.0.1; | ||
9 | ACCEPT_FROM6 = ::1; | ||
10 | DEFAULTSERVICES = topology hostlist | ||
11 | UNIXPATH = /tmp/gnunet-service-arm.sock | ||
12 | UNIX_MATCH_UID = YES | ||
13 | UNIX_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 @@ | |||
1 | INCLUDES = -I$(top_srcdir)/src/include | 1 | INCLUDES = -I$(top_srcdir)/src/include |
2 | 2 | ||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
4 | |||
5 | dist_pkgcfg_DATA = \ | ||
6 | ats.conf | ||
7 | |||
3 | if MINGW | 8 | if MINGW |
4 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 9 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
5 | endif | 10 | endif |
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] | ||
2 | AUTOSTART = YES | ||
3 | PORT = 2098 | ||
4 | HOSTNAME = localhost | ||
5 | HOME = $SERVICEHOME | ||
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-ats | ||
8 | ACCEPT_FROM = 127.0.0.1; | ||
9 | ACCEPT_FROM6 = ::1; | ||
10 | UNIXPATH = /tmp/gnunet-service-ats.sock | ||
11 | UNIX_MATCH_UID = YES | ||
12 | UNIX_MATCH_GID = YES | ||
13 | |||
14 | TOTAL_QUOTA_IN = 65536 | ||
15 | TOTAL_QUOTA_OUT = 65536 | ||
16 | # ATS options | ||
17 | DUMP_MLP = NO | ||
18 | DUMP_SOLUTION = NO | ||
19 | DUMP_OVERWRITE = NO | ||
20 | DUMP_MIN_PEERS = 0 | ||
21 | DUMP_MIN_ADDRS = 0 | ||
22 | DUMP_OVERWRITE = NO | ||
23 | ATS_MIN_INTERVAL = 15000 | ||
24 | ATS_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 | ||
3 | plugindir = $(libdir)/gnunet | 3 | plugindir = $(libdir)/gnunet |
4 | 4 | ||
5 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
6 | |||
7 | dist_pkgcfg_DATA = \ | ||
8 | block.conf | ||
9 | |||
5 | if MINGW | 10 | if MINGW |
6 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 11 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
7 | endif | 12 | endif |
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] | ||
2 | PLUGINS = 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 @@ | |||
1 | INCLUDES = -I$(top_srcdir)/src/include | 1 | INCLUDES = -I$(top_srcdir)/src/include |
2 | 2 | ||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
4 | |||
5 | dist_pkgcfg_DATA = \ | ||
6 | chat.conf | ||
7 | |||
3 | if MINGW | 8 | if MINGW |
4 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 9 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
5 | endif | 10 | endif |
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] | ||
2 | AUTOSTART = YES | ||
3 | PORT = 2090 | ||
4 | HOSTNAME = localhost | ||
5 | HOME = $SERVICEHOME | ||
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-chat | ||
8 | ACCEPT_FROM = 127.0.0.1; | ||
9 | ACCEPT_FROM6 = ::1; | ||
10 | UNIXPATH = /tmp/gnunet-service-chat.sock | ||
11 | UNIX_MATCH_UID = NO | ||
12 | UNIX_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 @@ | |||
1 | INCLUDES = -I$(top_srcdir)/src/include | 1 | INCLUDES = -I$(top_srcdir)/src/include |
2 | 2 | ||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
4 | |||
5 | dist_pkgcfg_DATA = \ | ||
6 | core.conf | ||
7 | |||
3 | if MINGW | 8 | if MINGW |
4 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 9 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
5 | endif | 10 | endif |
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] | ||
2 | AUTOSTART = YES | ||
3 | PORT = 2092 | ||
4 | HOSTNAME = localhost | ||
5 | HOME = $SERVICEHOME | ||
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-core | ||
8 | ACCEPT_FROM = 127.0.0.1; | ||
9 | ACCEPT_FROM6 = ::1; | ||
10 | # quotas are in bytes per second now! | ||
11 | TOTAL_QUOTA_IN = 65536 | ||
12 | TOTAL_QUOTA_OUT = 65536 | ||
13 | UNIXPATH = /tmp/gnunet-service-core.sock | ||
14 | UNIX_MATCH_UID = YES | ||
15 | UNIX_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] |
45 | AUTOSTART = NO | 45 | AUTOSTART = NO |
46 | |||
47 | [dv] | ||
48 | AUTOSTART = 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 | ||
3 | plugindir = $(libdir)/gnunet | 3 | plugindir = $(libdir)/gnunet |
4 | 4 | ||
5 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
6 | |||
7 | dist_pkgcfg_DATA = \ | ||
8 | datacache.conf | ||
9 | |||
5 | if MINGW | 10 | if MINGW |
6 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 11 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
7 | endif | 12 | endif |
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] | ||
2 | DATABASE = gnunetcheck | ||
3 | CONFIG = ~/.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 | ||
3 | plugindir = $(libdir)/gnunet | 3 | plugindir = $(libdir)/gnunet |
4 | 4 | ||
5 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
6 | |||
7 | dist_pkgcfg_DATA = \ | ||
8 | datastore.conf | ||
9 | |||
5 | if MINGW | 10 | if MINGW |
6 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 11 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
7 | endif | 12 | endif |
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] | ||
2 | AUTOSTART = YES | ||
3 | UNIXPATH = /tmp/gnunet-service-datastore.sock | ||
4 | UNIX_MATCH_UID = YES | ||
5 | UNIX_MATCH_GID = YES | ||
6 | PORT = 2093 | ||
7 | HOSTNAME = localhost | ||
8 | HOME = $SERVICEHOME | ||
9 | CONFIG = $DEFAULTCONFIG | ||
10 | BINARY = gnunet-service-datastore | ||
11 | ACCEPT_FROM = 127.0.0.1; | ||
12 | ACCEPT_FROM6 = ::1; | ||
13 | QUOTA = 100000000 | ||
14 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | ||
15 | DATABASE = sqlite | ||
16 | # DISABLE_SOCKET_FORWARDING = NO | ||
17 | |||
18 | [datastore-sqlite] | ||
19 | FILENAME = $SERVICEHOME/datastore/sqlite.db | ||
20 | |||
21 | [datastore-postgres] | ||
22 | CONFIG = connect_timeout=10; dbname=gnunet | ||
23 | |||
24 | [datastore-mysql] | ||
25 | DATABASE = gnunet | ||
26 | CONFIG = ~/.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] |
15 | AUTOSTART = NO | 15 | AUTOSTART = NO |
16 | |||
17 | [dv] | ||
18 | AUTOSTART = 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 | ||
6 | plugindir = $(libdir)/gnunet | 6 | plugindir = $(libdir)/gnunet |
7 | 7 | ||
8 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
9 | |||
10 | dist_pkgcfg_DATA = \ | ||
11 | dht.conf | ||
12 | |||
8 | if HAVE_ZLIB | 13 | if HAVE_ZLIB |
9 | ZLIB_LNK = -lz | 14 | ZLIB_LNK = -lz |
10 | endif | 15 | endif |
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] | ||
2 | AUTOSTART = YES | ||
3 | PORT = 2095 | ||
4 | HOSTNAME = localhost | ||
5 | HOME = $SERVICEHOME | ||
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-dht | ||
8 | ACCEPT_FROM = 127.0.0.1; | ||
9 | ACCEPT_FROM6 = ::1; | ||
10 | BUCKET_SIZE = 4 | ||
11 | UNIXPATH = /tmp/gnunet-service-dht.sock | ||
12 | UNIX_MATCH_UID = YES | ||
13 | UNIX_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] | ||
36 | DATABASE = sqlite | ||
37 | QUOTA = 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 | ||
12 | plugindir = $(libdir)/gnunet | 12 | plugindir = $(libdir)/gnunet |
13 | 13 | ||
14 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
15 | |||
16 | dist_pkgcfg_DATA = \ | ||
17 | dv.conf | ||
18 | |||
14 | lib_LTLIBRARIES = libgnunetdv.la | 19 | lib_LTLIBRARIES = libgnunetdv.la |
15 | 20 | ||
16 | plugin_LTLIBRARIES = libgnunet_plugin_transport_dv.la | 21 | plugin_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] | ||
2 | AUTOSTART = YES | ||
3 | DEBUG = NO | ||
4 | ACCEPT_FROM6 = ::1; | ||
5 | ACCEPT_FROM = 127.0.0.1; | ||
6 | BINARY = gnunet-service-dv | ||
7 | CONFIG = $DEFAULTCONFIG | ||
8 | HOME = $SERVICEHOME | ||
9 | HOSTNAME = localhost | ||
10 | PORT = 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 |
10 | endif | 10 | endif |
11 | 11 | ||
12 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
13 | |||
14 | dist_pkgcfg_DATA = \ | ||
15 | fs.conf | ||
16 | |||
12 | 17 | ||
13 | lib_LTLIBRARIES = libgnunetfs.la | 18 | lib_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] | ||
2 | AUTOSTART = YES | ||
3 | INDEXDB = $SERVICEHOME/idxinfo.lst | ||
4 | TRUST = $SERVICEHOME/data/credit/ | ||
5 | IDENTITY_DIR = $SERVICEHOME/identities/ | ||
6 | STATE_DIR = $SERVICEHOME/persistence/ | ||
7 | UPDATE_DIR = $SERVICEHOME/updates/ | ||
8 | PORT = 2094 | ||
9 | HOSTNAME = localhost | ||
10 | HOME = $SERVICEHOME | ||
11 | CONFIG = $DEFAULTCONFIG | ||
12 | BINARY = gnunet-service-fs | ||
13 | ACCEPT_FROM = 127.0.0.1; | ||
14 | ACCEPT_FROM6 = ::1; | ||
15 | |||
16 | DELAY = YES | ||
17 | CONTENT_CACHING = YES | ||
18 | CONTENT_PUSHING = YES | ||
19 | |||
20 | UNIXPATH = /tmp/gnunet-service-fs.sock | ||
21 | UNIX_MATCH_UID = NO | ||
22 | UNIX_MATCH_GID = YES | ||
23 | # DISABLE_SOCKET_FORWARDING = NO | ||
24 | # DEBUG = YES | ||
25 | MAX_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) | ||
29 | MIN_MIGRATION_DELAY = 100 | ||
30 | EXPECTED_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] |
73 | AUTOSTART = NO | 73 | AUTOSTART = NO |
74 | |||
75 | [dv] | ||
76 | AUTOSTART = 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 @@ | |||
1 | INCLUDES = -I$(top_srcdir)/src/include | 1 | INCLUDES = -I$(top_srcdir)/src/include |
2 | 2 | ||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
4 | |||
5 | dist_pkgcfg_DATA = \ | ||
6 | hostlist.conf | ||
7 | |||
3 | if USE_COVERAGE | 8 | if USE_COVERAGE |
4 | AM_CFLAGS = --coverage -O0 | 9 | AM_CFLAGS = --coverage -O0 |
5 | endif | 10 | endif |
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 | ||
3 | HTTPPORT = 8080 | ||
4 | HOME = $SERVICEHOME | ||
5 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | ||
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-daemon-hostlist | ||
8 | # consider having "-e" as default as well once implemented | ||
9 | OPTIONS = -b | ||
10 | SERVERS = http://v9.gnunet.org:58080/ | ||
11 | # proxy for downloading hostlists | ||
12 | HTTP-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] |
50 | AUTOSTART = NO | 50 | AUTOSTART = NO |
51 | |||
52 | [dv] | ||
53 | AUTOSTART = 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 |
10 | endif | 10 | endif |
11 | 11 | ||
12 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
13 | |||
14 | dist_pkgcfg_DATA = \ | ||
15 | mesh.conf | ||
16 | |||
12 | AM_CLFAGS = -g | 17 | AM_CLFAGS = -g |
13 | 18 | ||
14 | bin_PROGRAMS = \ | 19 | bin_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] | ||
2 | AUTOSTART = YES | ||
3 | PORT = 2096 | ||
4 | HOSTNAME = localhost | ||
5 | HOME = $SERVICEHOME | ||
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-mesh | ||
8 | ACCEPT_FROM = 127.0.0.1; | ||
9 | ACCEPT_FROM6 = ::1; | ||
10 | UNIXPATH = /tmp/gnunet-service-mesh.sock | ||
11 | UNIX_MATCH_UID = YES | ||
12 | UNIX_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 |
8 | endif | 8 | endif |
9 | 9 | ||
10 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
11 | |||
12 | dist_pkgcfg_DATA = \ | ||
13 | nat.conf | ||
14 | |||
10 | 15 | ||
11 | if ENABLE_TEST_RUN | 16 | if 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? | ||
3 | BEHIND_NAT = NO | ||
4 | |||
5 | # Is the NAT hole-punched? | ||
6 | PUNCHED_NAT = NO | ||
7 | |||
8 | # Enable UPNP by default? | ||
9 | ENABLE_UPNP = NO | ||
10 | |||
11 | # Use addresses from the local network interfaces (inluding loopback, but also others) | ||
12 | USE_LOCALADDR = YES | ||
13 | |||
14 | # Use address obtained from a DNS lookup of our hostname | ||
15 | USE_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? | ||
24 | ENABLE_ICMP_CLIENT = NO | ||
25 | ENABLE_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 | ||
33 | DISABLEV6 = NO | ||
34 | |||
35 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) | ||
36 | RETURN_LOCAL_ADDRESSES = NO | ||
37 | |||
38 | # How often do we query the DNS resolver | ||
39 | # for our hostname (to get our own IP), in ms | ||
40 | HOSTNAME_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 | ||
45 | IFC_SCAN_FREQUENCY = 3000000 | ||
46 | |||
47 | # How often do we query the DNS resolver | ||
48 | # for our hostname (to get our own IP), in ms | ||
49 | DYNDNS_FREQUENCY = 140000 | ||
50 | |||
51 | [gnunet-nat-server] | ||
52 | HOSTNAME = gnunet.org | ||
53 | PORT = 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 |
10 | endif | 10 | endif |
11 | 11 | ||
12 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
13 | |||
14 | dist_pkgcfg_DATA = \ | ||
15 | nse.conf | ||
16 | |||
12 | 17 | ||
13 | lib_LTLIBRARIES = libgnunetnse.la | 18 | lib_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] | ||
2 | AUTOSTART = YES | ||
3 | PORT = 2097 | ||
4 | HOSTNAME = localhost | ||
5 | HOME = $SERVICEHOME | ||
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-nse | ||
8 | ACCEPT_FROM = 127.0.0.1; | ||
9 | ACCEPT_FROM6 = ::1; | ||
10 | UNIXPATH = /tmp/test-nse-service-nse.unix | ||
11 | UNIX_MATCH_UID = YES | ||
12 | UNIX_MATCH_GID = YES | ||
13 | PROOFFILE = $SERVICEHOME/.nse-proof | ||
14 | HISTOGRAM = $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. | ||
18 | WORKDELAY = 5 | ||
19 | |||
20 | # Note: changing any of the values below will make this peer | ||
21 | # completely incompatible with other peers! | ||
22 | INTERVAL = 3600000 | ||
23 | WORKBITS = 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 @@ | |||
1 | INCLUDES = -I$(top_srcdir)/src/include | 1 | INCLUDES = -I$(top_srcdir)/src/include |
2 | 2 | ||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
4 | |||
5 | dist_pkgcfg_DATA = \ | ||
6 | peerinfo.conf | ||
7 | |||
3 | if MINGW | 8 | if 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 |
5 | endif | 10 | endif |
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] | ||
2 | AUTOSTART = YES | ||
3 | PORT = 2090 | ||
4 | HOSTNAME = localhost | ||
5 | HOME = $SERVICEHOME | ||
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-peerinfo | ||
8 | ACCEPT_FROM = 127.0.0.1; | ||
9 | ACCEPT_FROM6 = ::1; | ||
10 | UNIXPATH = /tmp/gnunet-service-peerinfo.sock | ||
11 | UNIX_MATCH_UID = NO | ||
12 | UNIX_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 | HOSTS = $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 |
10 | endif | 10 | endif |
11 | 11 | ||
12 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
13 | |||
14 | dist_pkgcfg_DATA = \ | ||
15 | statistics.conf | ||
12 | 16 | ||
13 | lib_LTLIBRARIES = libgnunetstatistics.la | 17 | lib_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] | ||
2 | AUTOSTART = YES | ||
3 | PORT = 2088 | ||
4 | HOSTNAME = localhost | ||
5 | HOME = $SERVICEHOME | ||
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-statistics | ||
8 | ACCEPT_FROM = 127.0.0.1; | ||
9 | ACCEPT_FROM6 = ::1; | ||
10 | UNIXPATH = /tmp/gnunet-service-statistics.sock | ||
11 | UNIX_MATCH_UID = NO | ||
12 | UNIX_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 @@ | |||
1 | INCLUDES = -I$(top_srcdir)/src/include | 1 | INCLUDES = -I$(top_srcdir)/src/include |
2 | 2 | ||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
4 | |||
5 | dist_pkgcfg_DATA = \ | ||
6 | template.conf | ||
7 | |||
3 | if MINGW | 8 | if MINGW |
4 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 9 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
5 | endif | 10 | endif |
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] | ||
2 | AUTOSTART = NO | ||
3 | PORT = 9999 | ||
4 | HOSTNAME = localhost | ||
5 | HOME = $SERVICEHOME | ||
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-template | ||
8 | ACCEPT_FROM = 127.0.0.1; | ||
9 | ACCEPT_FROM6 = ::1; | ||
10 | UNIXPATH = /tmp/gnunet-service-template.sock | ||
11 | UNIX_MATCH_UID = YES | ||
12 | UNIX_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 |
10 | endif | 10 | endif |
11 | 11 | ||
12 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
13 | |||
14 | dist_pkgcfg_DATA = \ | ||
15 | testing.conf | ||
16 | |||
12 | if HAVE_EXPENSIVE_TESTS | 17 | if 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] |
60 | AUTOSTART = NO | 60 | AUTOSTART = NO |
61 | |||
62 | [dv] | ||
63 | AUTOSTART = 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? | ||
3 | CONNECT_TIMEOUT = 30 | ||
4 | # How many connect attempts should we make? | ||
5 | CONNECT_ATTEMPTS = 3 | ||
6 | # How many connections can happen simultaneously? | ||
7 | MAX_OUTSTANDING_CONNECTIONS = 50 | ||
8 | |||
9 | # Should we clean up the files on peer group shutdown? | ||
10 | DELETE_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 |
5 | endif | 5 | endif |
6 | 6 | ||
7 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
8 | |||
9 | dist_pkgcfg_DATA = \ | ||
10 | topology.conf | ||
11 | |||
7 | 12 | ||
8 | bin_PROGRAMS = \ | 13 | bin_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] | ||
2 | MINIMUM-FRIENDS = 0 | ||
3 | FRIENDS-ONLY = NO | ||
4 | AUTOCONNECT = YES | ||
5 | TARGET-CONNECTION-COUNT = 16 | ||
6 | FRIENDS = $SERVICEHOME/friends | ||
7 | CONFIG = $DEFAULTCONFIG | ||
8 | BINARY = 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 | ||
3 | plugindir = $(libdir)/gnunet | 3 | plugindir = $(libdir)/gnunet |
4 | 4 | ||
5 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
6 | |||
7 | dist_pkgcfg_DATA = \ | ||
8 | transport.conf | ||
9 | |||
5 | 10 | ||
6 | if HAVE_MHD | 11 | if 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] |
33 | AUTOSTART = NO | 33 | AUTOSTART = NO |
34 | 34 | ||
35 | [dv] | ||
36 | AUTOSTART = NO | ||
37 | |||
35 | [nat] | 38 | [nat] |
36 | DISABLEV6 = YES | 39 | DISABLEV6 = YES |
37 | BINDTO = 127.0.0.1 | 40 | BINDTO = 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] | ||
2 | AUTOSTART = YES | ||
3 | PORT = 2091 | ||
4 | HOSTNAME = localhost | ||
5 | HOME = $SERVICEHOME | ||
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-transport | ||
8 | #PREFIX = valgrind | ||
9 | NEIGHBOUR_LIMIT = 50 | ||
10 | ACCEPT_FROM = 127.0.0.1; | ||
11 | ACCEPT_FROM6 = ::1; | ||
12 | PLUGINS = tcp | ||
13 | UNIXPATH = /tmp/gnunet-service-transport.sock | ||
14 | BLACKLIST_FILE = $SERVICEHOME/blacklist | ||
15 | UNIX_MATCH_UID = YES | ||
16 | UNIX_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) | ||
29 | PORT = 2086 | ||
30 | ADVERTISED_PORT = 2086 | ||
31 | |||
32 | # Maximum number of open TCP connections allowed | ||
33 | MAX_CONNECTIONS = 128 | ||
34 | |||
35 | TIMEOUT = 5000 | ||
36 | # ACCEPT_FROM = | ||
37 | # ACCEPT_FROM6 = | ||
38 | # REJECT_FROM = | ||
39 | # REJECT_FROM6 = | ||
40 | # BINDTO = | ||
41 | MAX_CONNECTIONS = 128 | ||
42 | |||
43 | [transport-udp] | ||
44 | PORT = 2086 | ||
45 | #BROADCAST = YES | ||
46 | #BROADCAST_PORT = 20089 | ||
47 | #BROADCAST_INTERVAL = 30000 | ||
48 | MAX_BPS = 1000000 | ||
49 | |||
50 | [transport-http] | ||
51 | PORT = 1080 | ||
52 | MAX_CONNECTIONS = 128 | ||
53 | |||
54 | [transport-https] | ||
55 | PORT = 4433 | ||
56 | CRYPTO_INIT = NORMAL | ||
57 | KEY_FILE = https.key | ||
58 | CERT_FILE = https.cert | ||
59 | MAX_CONNECTIONS = 128 | ||
60 | |||
61 | [transport-wlan] | ||
62 | # Name of the interface in monitor mode (typically monX) | ||
63 | INTERFACE = mon0 | ||
64 | # Real hardware, no testing | ||
65 | TESTMODE = 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 | ||
3 | plugindir = $(libdir)/gnunet | 3 | plugindir = $(libdir)/gnunet |
4 | 4 | ||
5 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
6 | |||
7 | dist_pkgcfg_DATA = \ | ||
8 | util.conf resolver.conf | ||
9 | |||
5 | if MINGW | 10 | if MINGW |
6 | noinst_LTLIBRARIES = \ | 11 | noinst_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 | */ | ||
1224 | static int | ||
1225 | parse_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] | ||
2 | AUTOSTART = YES | ||
3 | PORT = 2089 | ||
4 | HOSTNAME = localhost | ||
5 | HOME = $SERVICEHOME | ||
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-resolver | ||
8 | ACCEPT_FROM = 127.0.0.1; | ||
9 | ACCEPT_FROM6 = ::1; | ||
10 | UNIXPATH = /tmp/gnunet-service-resolver.sock | ||
11 | UNIX_MATCH_UID = NO | ||
12 | UNIX_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] | ||
2 | SERVICEHOME = ~/.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] | ||
10 | HOSTKEY = $SERVICEHOME/.hostkey | ||
11 | |||
12 | [client] | ||
13 | HOME = $SERVICEHOME | ||
14 | |||
15 | [TESTING] | ||
16 | WEAKRANDOM = 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 |
9 | endif | 9 | endif |
10 | 10 | ||
11 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
12 | |||
13 | dist_pkgcfg_DATA = \ | ||
14 | vpn.conf | ||
15 | |||
11 | if LINUX | 16 | if LINUX |
12 | VPNBIN = gnunet-helper-vpn | 17 | VPNBIN = gnunet-helper-vpn |
13 | HIJACKBIN = gnunet-helper-hijack-dns | 18 | HIJACKBIN = 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] | ||
2 | CONFIG = $DEFAULTCONFIG | ||
3 | BINARY = gnunet-daemon-vpn | ||
4 | IPV6ADDR = 1234::1 | ||
5 | IPV6PREFIX = 32 | ||
6 | IPV4ADDR = 10.11.10.1 | ||
7 | IPV4MASK = 255.255.0.0 | ||
8 | VIRTDNS = 10.11.10.2 | ||
9 | VIRTDNS6 = 1234::17 | ||
10 | IFNAME = vpn-gnunet | ||
11 | |||
12 | [exit] | ||
13 | CONFIG = $DEFAULTCONFIG | ||
14 | BINARY = gnunet-daemon-exit | ||
15 | IPV6ADDR = 1234:1::1 | ||
16 | IPV6PREFIX = 32 | ||
17 | IPV4ADDR = 10.10.1.1 | ||
18 | IPV4MASK = 255.255.0.0 | ||
19 | IFNAME = exit-gnunet | ||
20 | ENABLE_UDP = NO | ||
21 | ENABLE_TCP = NO | ||
22 | |||
23 | [dns] | ||
24 | AUTOSTART = YES | ||
25 | PORT = 0 | ||
26 | HOSTNAME = localhost | ||
27 | HOME = $SERVICEHOME | ||
28 | CONFIG = $DEFAULTCONFIG | ||
29 | BINARY = gnunet-service-dns | ||
30 | ACCEPT_FROM = 127.0.0.1; | ||
31 | ACCEPT_FROM6 = ::1; | ||
32 | UNIXPATH = /tmp/gnunet-service-dns.sock | ||
33 | PROVIDE_EXIT = NO | ||