aboutsummaryrefslogtreecommitdiff
path: root/contrib
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 /contrib
parentb303961f38c9b578f30248ee364ed4e5ffdcd06c (diff)
downloadgnunet-29c724d2a7764f83fe846b418d09540348b86983.tar.gz
gnunet-29c724d2a7764f83fe846b418d09540348b86983.zip
implementing #1747
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Makefile.am3
-rw-r--r--contrib/defaults.conf505
-rw-r--r--contrib/test_gnunet_prefix.c2
3 files changed, 2 insertions, 508 deletions
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);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-18 01:00:51 +0000