gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r1112 - GNUnet/contrib


From: durner
Subject: [GNUnet-SVN] r1112 - GNUnet/contrib
Date: Tue, 28 Jun 2005 11:27:16 -0700 (PDT)

Author: durner
Date: 2005-06-28 11:27:11 -0700 (Tue, 28 Jun 2005)
New Revision: 1112

Modified:
   GNUnet/contrib/gnunet.root
   GNUnet/contrib/gnunet.user
Log:
regenerated by "gnunet-setup recreate"

Modified: GNUnet/contrib/gnunet.root
===================================================================
--- GNUnet/contrib/gnunet.root  2005-06-28 18:01:38 UTC (rev 1111)
+++ GNUnet/contrib/gnunet.root  2005-06-28 18:27:11 UTC (rev 1112)
@@ -1,639 +1,166 @@
 #
-# (first two lines of this file are generated by gnunetd,
-# see src/util/generate in the SVN source code! They will
-# set the first section to [GNUNETD] and also define
-# the GNUNETD_HOME directory (see explanation below).
+# Automatically generated by gnunet-setup
 #
-# This is the configuration for the GNUnet daemon, gnunetd.
-# Copy this file to "/etc/gnunet.conf" if you are root. 
-# For any other location, you must explicitly tell gnunetd
-# where this file is (option -c FILENAME).
-#
-# After any change in this file, you may want to manually restart
-# gnunetd since some changes are only recognized after a re-start.
-# Sending a SIGHUP to gnunetd will trigger re-reading the following
-# options:
-# NETWORK: HELOEXCHANGE
-# GNUNETD: LOGLEVEL
-# LOAD: INTERFACES
-# LOAD: BASICLIMITING
-# LOAD: MAXNETDOWNBPSTOTAL
-# LOAD: MAXNETUPBPSTOTAL
-# LOAD: MAXCPULOAD
-#
-#
-# This file is structured as follows.
-# 1) GNUNETD_HOME - base directory for all GNUnet files
-# 2) gnunetd options (which transport and application services, logging)
-# 3) network configuration 
-# 4) load management (resource limitations)
-# 5) UDP, TCP and SMTP transport configuration
-# 6) configuration for anonymous file sharing (AFS)
-#
-#################################################
 
-#########################################
-# Options for the GNUnet server, gnunetd
-#########################################
-
-[GNUNETD]
-
-# This line gives the root-directory of the GNUnet installation. Make
-# sure there is some space left in that directory. :-)  Users inserting
-# or indexing files will be able to store data in this directory
-# up to the (global) quota specified below.  Having a few gigabytes
-# of free space is recommended.
-# Default: GNUNETD_HOME     = /var/lib/GNUnet
-# GNUNETD_HOME     = /var/lib/GNUnet
-
-# How many minutes is the current IP valid?  (GNUnet will sign HELO
-# messages with this expiration timeline. If you are on dialup, 60
-# (for 1 hour) is suggested. If you are having a static IP address,
-# you may want to set this to a large value (say 14400).  The default
-# is 1440 (1 day). If your IP changes periodically, you will want to
-# choose the expiration to be smaller than the frequency with which
-# your IP changes.
-# The largest legal value is 14400 (10 days).
-# Default: HELOEXPIRES     = 1440
-HELOEXPIRES     = 1440
-
-# Loglevel, how much should be logged? You can use NOTHING, FATAL,
-# ERROR, FAILURE, WARNING, MESSAGE, INFO, DEBUG, CRON or EVERYTHING
-# (which log more and more messages in this order). Default is
-# WARNING.
-LOGLEVEL        = WARNING
-
-# In which file should gnunetd write the logs?  If you specify
-# nothing, logs are written to stderr (and note that if gnunetd runs
-# in the background, stderr is closed and all logs are discarded).
-# Default: LOGFILE         = $GNUNETD_HOME/logs
-LOGFILE         = $GNUNETD_HOME/logs
-
-# How long should logs be kept? If you specify a value greater
-# than zero, a log is created each day with the date appended
-# to its filename. These logs are deleted after $KEEPLOG days.
-# To disable this function, set this setting to its default   
-# value 0.
-KEEPLOG         = 0
-
-# In which file should gnunetd write the process-id of the server?  If
-# you run gnunetd as root, you may want to choose
-# /var/run/gnunetd.pid. It's not the default since gnunetd may not
-# have write rights at that location.
-# Default: PIDFILE         = $GNUNETD_HOME/gnunetd.pid
-PIDFILE         = $GNUNETD_HOME/gnunetd.pid
-
-# This directory should be made available periodically --- it contains
-# information how to join GNUnet that is in no way private to the
-# local node.  This directory can be shared between nodes AND should
-# be put on a public web-server (if possible).  You should find a list
-# of known hosts under http://gnunet.org/hosts/, you can copy
-# those files into this directory.
-# 
-# If you specify a HOSTLISTURL, the directory will be automatically
-# populated by gnunetd with an initial set of nodes.
-# Default: HOSTS       = $GNUNETD_HOME/data/hosts/
-HOSTS          = $GNUNETD_HOME/data/hosts/
-
-# GNUnet can automatically update the hostlist from the web. While
-# GNUnet internally communicates which hosts are online, it is
-# typically a good idea to get a fresh hostlist whenever gnunetd
-# starts from the WEB. By setting this option, you can specify from
-# which server gnunetd should try to download the hostlist. The
-# default should be fine for now.
 #
-# The general format is a list of space-separated URLs.  Each URL must
-# have the format http://HOSTNAME/FILENAME
+# Server configuration
 #
-# If you want to setup an alternate hostlist server, you must run a
-# permanent node and "cat data/hosts/* > hostlist" every few minutes
-# to keep the list up-to-date.
-#
-# If you do not specify a HOSTLISTURL, you must copy valid hostkeys to
-# data/hosts manually.
-# Default: HOSTLISTURL = "http://gnunet.org/hostlist";
-HOSTLISTURL = "http://gnunet.org/hostlist";
 
-# If you have to use a proxy for outbound HTTP connections,
-# specify the proxy configuration here.  Default is no proxy.
-# HTTP-PROXY = localhost
-# HTTP-PROXY-PORT = 1080
-
-# Which applications should gnunetd support? Specify the name of the
-# dynamic shared object (DSO) that implements the service in the
-# gnunetd core here. Separate multiple modules with spaces.
 #
-# Whenever this option is changed, you MUST run gnunet-update.
+# Meta-configuration
 #
-# Currently, the available applications are:
-# advertising: always load this one
-# topology: always load this one, too!
-# getoption: probably a good idea, too!
-#
-# stats: statistics - for gnunet-stats
-# traffic: traffic analysis 
-# fs: file sharing
-# chat: broadcast chat (demo-application)
-# tbench: benchmark tool for transport performance
-# tracekit: GNUnet topology visualization toolkit
-#
-# The chat, tbench and tracekit protocols are potential security risks
-# and have been engineered for testing GNUnet or demonstrating how
-# GNUnet works. They should be used with caution.
-#
-# Using the fs tools for downloading may require the traffic module
-# to be loaded!
-#
-# Default: APPLICATIONS = "advertising topology fs getoption stats traffic"
-APPLICATIONS = "advertising topology fs getoption stats traffic"
+[Meta]
+config-daemon.in_CONF_DEF_DIR = "/etc/"
+config-daemon.in_CONF_DEF_FILE = "gnunet.root"
+EXPERIMENTAL = NO
+ADVANCED = NO
+RARE = NO
 
-# Which transport mechanisms are available? Use space-separated list
-# of the modules, e.g.  "udp smtp tcp". The order is irrelevant, each
-# protocol has a build-in cost-factor and this factor determines which
-# protocols are preferred.  
 #
-# The available transports at this point are udp, tcp, http, smtp,
-# tcp6, udp6 and the special 'nat' service.
+# General settings
 #
-# Loading the 'nat' and 'tcp' modules is required for peers behind NAT
-# boxes that cannot directly be reached from the outside.  Peers that
-# are NOT behind a NAT box and that want to *allow* peers that ARE
-# behind a NAT box to connect must ALSO load the 'nat' module.  Note
-# that the actual transfer will always be via tcp initiated by the peer
-# behind the NAT box.
-#
-# Usually, the default is just fine for most people.
-# Choices are: "udp tcp udp6 tcp6 nat http smtp"
-# Default: TRANSPORTS = "udp tcp http nat"
+[GNUNETD]
+GNUNETD_HOME = "/var/lib/GNUnet"
+HELOEXPIRES = 1440
+LOGLEVEL = "WARNING"
+LOGFILE = "$GNUNETD_HOME/logs"
+KEEPLOG = "0"
+PIDFILE = "$GNUNETD_HOME/gnunet.pid"
+HOSTS = "$GNUNETD_HOME/data/hosts/"
+HOSTLISTURL = "http://gnunet.org/hostlist http://mikael.karlsson.com/hostlist";
+HTTP-PROXY = ""
+HTTP-PROXY-PORT = 1080
+APPLICATIONS = "advertising topology fs getoption stats traffic"
 TRANSPORTS = "udp tcp http nat"
 
-
-###########################################
-# Module configuration.
-# Be VERY careful here, wrong values will
-# DEFINITIVELY cause GNUnet to crash.
-# Read documentation at 
-# FIXME: add URI here!
 #
-# Note that everything in this section must
-# be without caps (keys and values).
-# Not defining any value for any of the 
-# entries is also likely to not work.
-###########################################
-[MODULES]
-
-# Which database should be used?  The options
-# are "sqstore_sqlite" and "sqstore_mysql".
-# Default is "sqstore_sqlite".  You must run
-# gnunet-update after changing this value!
+# Modules
 #
-# In order to use sqstore_mysql, you must configure
-# the mysql database, which is non-trivial.
-# Read the file doc/README.mysql for how to setup
-# mysql.
-# The default is "sqstore_sqlite".
+[MODULES]
 sqstore = "sqstore_sqlite"
-
-# Which topology should be used?  The only
-# option at the moment is "topology_default".
-#
-# The default is "topology_default"
 topology = "topology_default"
 
-
-############################################
-# Network configuration
-############################################
+#
+# Network
+#
 [NETWORK]
-
-# Which is the client-server port that is used between gnunetd and the
-# clients (TCP only).  You may firewall this port for non-local
-# machines.
-# Default: PORT = 2087
 PORT = 2087
+INTERFACE = ""
+IP = ""
+F2F = "$GNUNETD_HOME/friends"
+HELOEXCHANGE = YES
+TRUSTED = "127.0.0.0/8;"
 
-# Set if GNUnet fails to determine your IP.  GNUnet first tries to
-# determine your IP by looking at the IP that matches the interface
-# that is given with the option INTERFACE.
-# Under Windows, specify the ID reported by
-#  "gnunet-win-tool -n"
-# Default: INTERFACE = eth0
-INTERFACE = eth0
-
-# If this fails, GNUnet will try to do a DNS lookup on your HOSTNAME,
-# which may also fail, in particular if you are on dialup.
 #
-# If both options are not viable for you, you can specify an IP in
-# this configuration file.  This may be required if you have multiple
-# interfaces (currently GNUnet can only work on one of them) or if you
-# are behind a router/gateway that performs network address
-# translation (NAT). In the latter case, set this IP to the *external*
-# IP of the router (!) and make sure that the router forwards incoming
-# UDP packets on the GNUnet port (default: 2086) to the dedicated
-# GNUnet server in the local network.
+# Resource limitations
 #
-# The given example value (127.0.0.1) will NOT work!  If you do not know
-# what all this means, try without!
-# Default is no IP specified.
-# IP   = 127.0.0.1
-
-# If this host is connected to two networks, a private which is not
-# reachable from the Internet and that contains GNUnet clients and to
-# a public network, typically the Internet (and is this host is thus
-# in the position of a router, typically doing NAT), then this option
-# should be set to 'NO'. It prevents the node from forwarding HELOs
-# other than its own. If you do not know what the above is about, just
-# keep it set to YES (which is also the default when the option is not
-# given).
-# Default is yes: HELOEXCHANGE = YES
-HELOEXCHANGE = YES
-
-# With this option, you can specify which networks are trusted enough
-# to connect as clients to the TCP port.  This is useful if you run
-# gnunetd on one host of your network and want to allow all other
-# hosts to use this node as their server. By default, this is set to
-# 'loopback only'. The format is the same as for the BLACKLIST.
-# Default is: TRUSTED = 127.0.0.0/8;
-TRUSTED = 127.0.0.0/8;
-
-
-
-
-
-
-######################################
-# Options for load management 
-######################################
 [LOAD]
-# In this section you specify how many resources GNUnet is allowed to
-# use. GNUnet may exceed the limits by a small margin (network & CPU
-# are hard to control directly), but should do a reasonable job to
-# keep the average around these values
-
-# For which interfaces should we do accounting?  GNUnet will evaluate
-# the total traffic (not only the GNUnet related traffic) and adjust
-# its bandwidth usage accordingly. You can currently only specify a
-# single interface. GNUnet will also use this interface to determine
-# the IP to use. Typical values are eth0, ppp0, eth1, wlan0, etc.
-# 'ifconfig' will tell you what you have.  Never use 'lo', that just
-# won't work.
-# Under Windows, specify the ID reported by
-#  "gnunet-win-tool -n".
-# Default is: INTERFACES      = eth0
-INTERFACES      = eth0
-
-# Use basic bandwidth limitation? YES or NO.  The basic method (YES)
-# notes only GNUnet traffic and can be used to specify simple maximum
-# bandwidth usage of GNUnet.  Choose the basic method if you don't
-# want other network traffic to interfere with GNUnet's operation, but
-# still wish to constrain GNUnet's bandwidth usage, or if you can't
-# reliably measure the maximum capabilities of your connection.  YES
-# can be very useful if other applications are causing a lot of
-# traffic on your LAN.  In this case, you do not want to limit the
-# traffic that GNUnet can inflict on your WAN connection whenever your
-# high-speed LAN gets used (e.g. by NFS).
-#
-# The advanced bandwidth limitation (NO) measures total traffic over
-# the chosen interface (including traffic by other applications), and
-# allows gnunetd to participate if the total traffic is low enough.
-# Default is: BASICLIMITING = YES
 BASICLIMITING = YES
+INTERFACES = ""
+MAXNETDOWNBPSTOTAL = 50000
+MAXNETUPBPSTOTAL = 50000
+MAXCPULOAD = 50
 
-# Bandwidth limits in bytes per second. These denote the maximum
-# amounts GNUnet is allowed to use.
-# Defaults are: 
-# MAXNETUPBPSTOTAL     = 50000
-# MAXNETDOWNBPSTOTAL   = 50000
-MAXNETUPBPSTOTAL       = 50000
-MAXNETDOWNBPSTOTAL     = 50000
-
-
-# Which CPU load can be tolerated (total, GNUnet will adapt if the
-# load goes up due to other processes). A value of 50 means that once
-# your 1 minute-load average goes over 50% non-idle, GNUnet will start
-# dropping packets until it goes under that threshold again.
-# Default is MAXCPULOAD                = 50
-MAXCPULOAD             = 50
-
-
-
-
-###########################################
-# Options for the UDP transport layer.
-###########################################
-[UDP]
-
-# To which port does GNUnet bind? Default is 2086 and there is usually
-# no reason to change that.
-PORT           = 2086
-
-# With this option, you can specify which networks you do NOT want to
-# connect to. Usually you will want to filter loopback (127.0.0.1,
-# misconfigured GNUnet hosts), virtual private networks, [add a class
-# C network here], 192.168.0.0, 172.16.0.0 and 10.0.0.0 (RFC
-# 1918). The format is IP/NETMASK where the IP is specified in
-# dotted-decimal and the netmask either in CIDR notation (/16) or in
-# dotted decimal (255.255.0.0). Several entries must be separated by a
-# semicolon, spaces are not allowed.  Notice that if your host is on a
-# private network like the above, you will have to configure your NAT
-# to allow incoming requests and you will want to modify this option.
-# The idea behind this option is not to discriminate against NAT users
-# but to ensure that hosts only attempt to connect to machines that
-# they have a chance to actually reach.  Of course, you could also use
-# it against known adversaries that have a small IP range at their
-# disposal :-) 
 #
-# Example (and default):
-# 127.0.0.1/8;172.16.0.0/12;192.168.0.0/16;10.0.0.0/255.0.0.0;
-BLACKLIST = 127.0.0.1/8;172.16.0.0/12;192.168.0.0/16;10.0.0.0/255.0.0.0;
+# Transports
+#
 
-
-# The MTU to use. Do not use more than your OS
-# (and firewall) can support. Typically, your 
-# network-MTU - 28 is optimal, for ethernet, this
-# is 1472, the default. Do not use less than 1200.
 #
-# The default is 1472, which is also used if you specify
-# nothing.
+# UDP Transport
+#
+[UDP]
+PORT = 2086
+BLACKLIST = "127.0.0.1/8;172.16.0.0/12;192.168.0.0/16;10.0.0.0/255.0.0.0;"
 MTU = 1472
 
-
-###########################################
-# Options for the TCP transport layer.
-###########################################
+#
+# TCP Transport
+#
 [TCP]
-
-# To which port does GNUnet bind? Default is 2086 and there is usually
-# no reason to change that.  Make sure that this port does not
-# conflict with the port for GNUnet clients (section NETWORK), which
-# defaults to 2087.  
 PORT = 2086
+BLACKLIST = "127.0.0.1/8;172.16.0.0/12;192.168.0.0/16;10.0.0.0/255.0.0.0;"
 
-# With this option, you can specify which networks you do NOT want to
-# connect to. Usually you will want to filter loopback (127.0.0.1,
-# misconfigured GNUnet hosts), virtual private networks, [add a class
-# C network here], 192.168.0.0, 172.16.0.0 and 10.0.0.0 (RFC
-# 1918). The format is IP/NETMASK where the IP is specified in
-# dotted-decimal and the netmask either in CIDR notation (/16) or in
-# dotted decimal (255.255.0.0). Several entries must be separated by a
-# semicolon, spaces are not allowed.  Notice that if your host is on a
-# private network like the above, you will have to configure your NAT
-# to allow incoming requests and you will want to modify this option.
-# The idea behind this option is not to discriminate against NAT users
-# but to ensure that hosts only attempt to connect to machines that
-# they have a chance to actually reach.  Of course, you could also use
-# it against known adversaries that have a small IP range at their
-# disposal :-)
-# Example (and default):
-# BLACKLIST = 127.0.0.1/8;192.168.0.0/16;10.0.0.0/255.0.0.0; 
-BLACKLIST = 127.0.0.1/8;192.168.0.0/16;10.0.0.0/255.0.0.0;
-
-
-###############################################
-# Options for NAT transport
-###############################################
-[NAT]
-
-# Is this machine behind a NAT that does not allow
-# connections from the outside to the GNUnet port?
-# (if you can configure the NAT box to allow
-# direct connections from other peers, set this
-# to NO).  Set this only to YES if other peers
-# cannot contact you directly via TCP or UDP.
-# If you set this to YES, you should also set the
-# TCP port to '0' and disable UDP to indicate that you
-# cannot accept inbound connections.
 #
-# Default: NO
+# NAT
+#
+[NAT]
 LIMITED = NO
 
-
-##########################################
-# IPv6 transports, don't bother unless you
-# want to use IPv6.
-##########################################
-
+#
+# UDP over IPv6
+#
 [UDP6]
-
-# Default port is 2088 and MTU is 1452.
 PORT = 2088
-# BLACKLIST = 
 MTU = 1452
+BLACKLIST = ""
 
+#
+# TCP over IPv6
+#
 [TCP6]
-
-# Default port is 2088 and MTU is 1440.
 PORT = 2088
-# BLACKLIST = 
+MTU = 1440
+BLACKLIST = ""
 
-[HTTP]
-
-# Default port is 1080 and MTU is 1400.
-PORT = 1080
-# BLACKLIST =
-
-
-###############################################
-# Options for SMTP transport
-###############################################
+#
+# SMTP
+#
 [SMTP]
-
-# E-mail address to use to receive messages.  Do not specify anything
-# if you do not want to allow SMTP as a receiver protocol; you can
-# still *send* email to establish connections in that case.  Example:
-# EMAIL = address@hidden
-# EMAIL =
-
-# MTU for the E-mail. How large should the E-mails be that we send
-# out? Default is 65536 (bytes).
-MTU = 65536
-
-# Port of the SMTP server for outbound mail.  If not specified, the
-# TCP/SMTP entry from /etc/services is consulted.  Default is 25.
+EMAIL = "address@hidden"
+MTU = 65535
 PORT = 25
-
-# Hostname of the SMTP server. Default is "localhost".
-SERVER = localhost
-
-# Hostname of the sender host to use in the HELO message of the SMTP
-# protocol (not to be confused with the HELO in the GNUnet p2p
-# protocol). Pick a hostname that works for your SMTP server. This
-# hostname has nothing to do with the hostname of the SMTP server or
-# your E-mail sender address (though those names should work in most
-# cases). In fact, it often does not even have to exist as a real
-# machine. Example: "myhost.example.com"
-SENDERHOSTNAME = myhost.example.com
-
-# Filter-line to use in the E-mail header. This filter will be
-# included in the GNUnet-generated E-mails and should be used to
-# filter out GNUnet traffic from the rest of your E-mail. Make sure
-# that the filter you choose is highly unlikely to occur in any other
-# message.
-#
-# Examples:
-# FILTER = "X-mailer: myGNUnetmail"
-# FILTER = "Subject: foobar5252"
+SERVER = "localhost"
+SENDERHOSTNAME = "myhost.example.com"
 FILTER = "X-mailer: 590N"
+PIPE = "/tmp/gnunet.smtp"
 
-# Name of the pipe via which procmail sends the filtered E-mails to
-# the node.  Default is /tmp/gnunet.smtp
-PIPE = /tmp/gnunet.smtp
-
-
-
-
-
-################################################
-# Options for anonymous filesharing (AFS).
-################################################
-[FS]
-
-# How much disk space (MB) is GNUnet allowed to use for file
-# sharing?  This does not take indexed files into account, only the
-# space directly used by GNUnet is accounted for.  GNUnet will gather
-# content from the network if the current space-consumption is below
-# the number given here (and if content migration is allowed below).
 #
-# IMPORTANT:
-# Note that if you change the quota, you need to run gnunet-convert,
-# otherwise your databases will be inconsistent and gnunetd will
-# refuse to work.  Default is 1024 (1 GB)
-QUOTA  = 1024
+# HTTP
+#
+[HTTP]
+PORT = 1080
+BLACKLIST = "127.0.0.1/8;172.16.0.0/12;192.168.0.0/16;10.0.0.0/255.0.0.0;"
 
-# Should we participate in content migration?  If you say yes here,
-# GNUnet will migrate content to your server, and you will not be able
-# to control what data is stored on your machine.  This option has
-# advantages and disadvantages.
 #
-# If you activate it, you can claim for *all* the non-indexed (-n to
-# gnunet-insert) content that you did not know what it was even if an
-# adversary takes control of your machine.
+# Applications
 #
-# If you do not activate it, it is obvious that you have knowledge of
-# all the content that is hosted on your machine and thus can be
-# considered liable for it.  
+
 #
-# So if you think that the legal system in your country has gone
-# postal, you may want to set it to "NO" and make sure that the
-# content you put on your machine does not get you into too much
-# trouble if an adversary takes control of your machine.  If you think
-# that you're safe if you host content that you don't know anything
-# about (like an ISP) or that you don't have to fear prosecution
-# no-matter-what, turn it to YES, which will also improve GNUnet's
-# performance and thereby your results.
+# Anonymous file sharing
 #
-# Note that as long as the adversary is not really powerful (e.g. can
-# not take control of your machine), GNUnet's build-in anonymity
-# mechanisms should protect you from being singled out easily.
-# 
-# Currently, activating active migration can cause some problems when
-# the database is getting full (gdbm reorganization can take very,
-# very long and make GNUnet look like it hangs for that time). Thus if
-# you turn it on, you may want to disable it after you hit the
-# quota. A better content management system should solve this problem
-# in the near future... [at the time of GNUnet 0.6.1c, the MySQL 
-# database module already works well even if the db is full.]
-# Default is YES.
+[FS]
+QUOTA = 1024
+ANONYMITY_RECEIVE = 0
+ANONYMITY_SEND = 0
 ACTIVEMIGRATION = YES
+DIR = "$GNUNETD_HOME/data/fs/"
+INDEX-DIRECTORY = "$GNUNETD_HOME/data/shared/"
+INDEX-QUOTA = 8192
 
-# Where to store the FS related data (content, etc)?
-DIR          = $GNUNETD_HOME/data/fs/
-
-# Where to store indexed files (NEW!)
-# Note that you MUST not copy files directly to this
-# directory.  gnunet-insert (or gnunet-gtk) will copy
-# the files that you index to this directory.  With the
-# -l option you instead create a link (if gnunetd and
-# gnunet-insert run on the same machine) instead.
 #
-# The QUOTA option does NOT apply for this directory.
-# To limit how much can be placed in this directory
-# set the option INDEX-QUOTA.  Files that are merely
-# linked do not count towards the quota.
+# MySQL
 #
-# If you uncomment this option gnunetd will refuse
-# content indexing requests (insertion will still be
-# possible).
-#
-# Note that files indexed with GNUnet before Version
-# 0.6.2 were not moved/linked to this directory.  But that
-# should not cause any immediate problems (the files
-# will continue to be downloadable).  What will be
-# impossible is unindexing these files with
-# gnunet-delete and GNUnet >= 0.6.2. 
-# Default is $GNUNETD_HOME/data/shared/
-INDEX-DIRECTORY = $GNUNETD_HOME/data/shared/
-
-# How many (parallel) threads should a given gnunet-download (or
-# gnunet-gtk) process run?  (this limits the amount of parallelism
-# used in the FSUI library).  Smaller values reduce memory and CPU
-# requirements.  Very large values will not be useful since even if
-# that much parallelism is theoretically possible, the local node may
-# not be able to route that many parallel requests anyway.  
-# Default: 32
-POOL = 32
-
-#######################################
-# MySQL specific options.
-#######################################
-
 [MYSQL]
-
-# If you suffer from too slow index/insert speeds, 
-# you might try to set this to YES for a small
-# efficiency boost.  If you run into any trouble
-# because of it, you're on your own.
-# Default: NO
 DELAYED = NO
 
-
-#######################################
-# TESTBED (experimental!)
-#######################################
-
+#
+# GNUnet Testbed
+#
 [TESTBED]
-
-# Where should we register the testbed service?
-# Default is "http://gnunet.org/testbed/";
 REGISTERURL = "http://gnunet.org/testbed/";
-
-# Is the testbed operator allowed to load and
-# unload modules? (somewhat of a security risk!)
-# Default is NO.
 ALLOW_MODULE_LOADING = NO
+UPLOAD-DIR = "$GNUNETD_HOME/testbed"
+LOGIN = "2087"
 
-# Where should file-uploads go?
-# Default is $GNUNETD_HOME/testbed
-UPLOAD-DIR = $GNUNETD_HOME/testbed
-
-# Login-name for SSH-tunnel (for secure testbed
-# connections).  Without login name the testbed-server
-# will try to make a direct TCP connection to the
-# application port (default: 2087).
-# LOGIN = 
-
-########################################
-# GAP options
-########################################
-
+#
+# GAP
+#
 [GAP]
-# Size of the routing table.
-# Default: 65536
 TABLESIZE = 65536
 
-########################################
-# DHT (experimental)
-########################################
-
+#
+# DHT
+#
 [DHT]
-
-# Number of buckets to use (determines memory requirements)
-# Default (and maximum) is 160.
 BUCKETCOUNT = 160
-
-# Amount of memory (in bytes) to use for the master table
-# (table that caches table-to-peer mappings).
-# Default is 65536.
 MASTER-TABLE-SIZE = 65536
-
-


Property changes on: GNUnet/contrib/gnunet.root
___________________________________________________________________
Name: svn:eol-style
   + LF

Modified: GNUnet/contrib/gnunet.user
===================================================================
--- GNUnet/contrib/gnunet.user  2005-06-28 18:01:38 UTC (rev 1111)
+++ GNUnet/contrib/gnunet.user  2005-06-28 18:27:11 UTC (rev 1112)
@@ -1,164 +1,74 @@
-# This is the USER configuration for your GNUnet node.  Copy this file to
-# "~/.gnunet/gnunet.conf".
-# For any other location, you must tell every GNUnet application 
-# that you start where this file is.  (option -c FILENAME).
 #
+# Automatically generated by gnunet-setup
 #
-#################################################
 
+#
+# User specific configuration
+#
 
-###############################################
-# General client options...
-###############################################
-[GNUNET]
-# This line gives the directory where GNUnet is putting
-# user-specific files (such as pseudonyms).  Typically,
-# GNUnet should not put more than a few of MB there.
 #
-# Default is GNUNET_HOME       = ~/.gnunet
-GNUNET_HOME    = ~/.gnunet
+# Meta-configuration
+#
+[Meta]
+config-client.in_CONF_DEF_DIR = "~/.gnunet/"
+config-client.in_CONF_DEF_FILE = "gnunet.user"
+ADVANCED-CLIENT = NO
+RARE-CLIENT = NO
 
-# Loglevel. What kinds of (debug) output should be printed? You can 
-# use NOTHING, FATAL, ERROR, FAILURE, WARNING, MESSAGE, INFO, DEBUG, 
-# CRON or EVERYTHING (which print more and more messages in this order). 
-# Default is WARNING which is usually enough to let you know if there
-# is any problems.
-LOGLEVEL        = WARNING
+#
+# General settings
+#
+[GNUNET]
+GNUNET_HOME = "~/.gnunet"
+LOGLEVEL = "WARNING"
+LOGFILE = "$GNUNET_HOME/logs"
 
-# For clients that want to fork a gnunetd process, which config
-# file should be used? (option -c will not be used if this option
-# is not set, this is the default).
-# EXAMPLE: GNUNETD-CONFIG = "~/.gnunet/gnunetd.conf"
-
-# Where to write the messages? Leave the entry unspecified (as
-# default) to make the clients print their messages to stderr.
-# Default is unspecified (stderr).
-#LOGFILE = $GNUNET_HOME/logs
-
-
-###############################################
-# Network options for the clients...
-###############################################
+#
+# Network options for the clients
+#
 [NETWORK]
-# Port to use to talk to gnunetd, default is 2087
 CLIENT-PORT = 2087
+HOST = "localhost"
 
-# On which machine runs gnunetd (for clients) This is equivalent to
-# the -H option.  Default is localhost.
-HOST = localhost
-
-
-
-
-################################################
-# Options for filesharing (FS).
-################################################
+#
+# Options for filesharing (FS)
+#
 [FS]
-
-# Default priority for locally inserted content
 INSERT-PRIORITY = 50
-
-# Default expiration time for locally inserted content, in days
-# Default is 36500 (100 years)
 INSERT-EXPIRATION = 36500
-
-# How long should gnunet-search try to get an answer to a query before
-# timing out (in seconds).  Default is "3000", which should be enough
-# for pretty much anything. Use 0 for no timeout.
-SEARCHTIMEOUT   = 3000
-
-# Anonymity level for receiving data (default).
+SEARCHTIMEOUT = 3000
 ANONYMITY-RECEIVE = 1
-
-# Anonymity level for sharing data (default).
 ANONYMITY-SEND = 1
-
-# Default limit for the number of search results (0 for unlimited).
 MAXRESULTS = 0
-
-# Default timeout for searches
-SEARCHTIMEOUT = 300
-
-# Specify which additional extractor libraries should be used.
-# gnunet-insert uses libextractor to extract keywords from files.
-# libextractor can be dynamically extended to handle additional file
-# formats. If you want to use more than the default set of extractors,
-# specify additional extractor libraries here.  The format is
-# [[-]LIBRARYNAME[:[-]LIBRARYNAME]*] The default is to use filenames
-# and to break larger words at spaces (and underscores, etc.).  This
-# should be just fine for most people. The - before a library name
-# indicates that this should be executed last and makes only sense for
-# the split-library.
-# Default is 
libextractor_filename:-libextractor_split:-libextractor_lower:-libextractor_thumbnail
-EXTRACTORS = 
libextractor_filename:-libextractor_split:-libextractor_lower:-libextractor_thumbnail
-
-# Where to download files to (by default)?
-# Default is /tmp/gnunet-downloads/
-DOWNLOADDIR     = /tmp/gnunet-downloads/
-
-# Disable symlinking.  When set to YES, GNUnet will always make
-# a copy of the file when files are indexed.  The default is to
-# try to use a symbolic link (if possible).
-# Note that you should NEVER, NEVER simply delete the .gnunet 
-# directory if this is set to 'NO', since all inserted files
-# will have been moved into that directory and replaced with
-# symbolic links.  So if you were to remove ~/.gnunet, you will
-# loose those files unless you first run gnunet-delete to undo
-# the symlinking!
-# It is much more (space)-efficient to set this to NO,
-# but you need to know what you're doing.  This is why the
-# default is 'YES'.
+SEARCHTIMEOUT = 3000
+EXTRACTORS = 
"libextractor_filename:-libextractor_split:-libextractor_lower:-libextractor_thumbnail"
+DOWNLOADDIR = "/tmp/gnunet-downloads/"
 DISABLE-SYMLINK = YES
 
-
-#################################################
+#
 # Default options for gnunet-gtk
-#################################################
+#
 [GNUNET-GTK]
+GNUNETD-CONFIG = "/etc/gnunetd.conf"
 
-# Path to the gnunet.conf file for gnunetd (for
-# forking gnunetd by gnunet-gtk)
-# default: not specified!
-# GNUNETD-CONFIG = /etc/gnunetd.conf
-
-
-##########################################
+#
 # Defaults for gnunet-chat
-##########################################
+#
 [GNUNET-CHAT]
+NICK = "my nickname"
 
-# You can specify your nickname here and thus avoid having to pass it
-# with -n NICK at the command-line.  The default is empty.
 #
-# NICK = "my nickname"
-
-##########################################
 # Defaults for gnunet-tracekit
-##########################################
+#
 [GNUNET-TRACEKIT]
-
-# How long to wait for replies (in seconds)? (default: 30)
-WAIT      = 30
-
-# How many hops should the trace go? (default: 5)
-HOPS     = 5
-
-# How important is the trace message? (default: 1000)
+WAIT = 30
+HOPS = 5
 PRIORITY = 1000
+FORMAT = 2
 
-# Output format, 0 is human readable, 1 is dot,
-# 2 is vcg (default: 2)
-FORMAT   = 2
-
-
+#
+# Defaults for gnunet-testbed
+#
 [GNUNET-TESTBED]
-
-# Port used internally by gnunet-testbed
-# (for the IPC in the gnunet-testbed shell).
-# The default is 2089.
 PORT = 2089
-
-# At which URL does the registration software
-# run?
-# Default is http://ovmj.org/GNUnet/testbed/
 REGISTERURL = "http://ovmj.org/GNUnet/testbed/";


Property changes on: GNUnet/contrib/gnunet.user
___________________________________________________________________
Name: svn:eol-style
   + LF





reply via email to

[Prev in Thread] Current Thread [Next in Thread]