r269 - in /debtorrent/trunk: ./ DebTorrent/BT1/ debian/

camrdale-guest at users.alioth.debian.org camrdale-guest at users.alioth.debian.org
Sun Aug 19 02:14:33 UTC 2007


Author: camrdale-guest
Date: Sun Aug 19 02:14:33 2007
New Revision: 269

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=269
Log:
Clean up the options and add an init and config script for the tracker.

Added:
    debtorrent/trunk/debian/debtorrent-tracker.default
    debtorrent/trunk/debian/debtorrent-tracker.init   (with props)
    debtorrent/trunk/debtorrent-tracker.conf
Modified:
    debtorrent/trunk/DebTorrent/BT1/track.py
    debtorrent/trunk/debian/changelog
    debtorrent/trunk/debian/debtorrent-client.init
    debtorrent/trunk/debian/debtorrent-client.sgml
    debtorrent/trunk/debian/debtorrent-tracker.sgml
    debtorrent/trunk/debian/debtorrent.install
    debtorrent/trunk/debian/rules
    debtorrent/trunk/setup.py

Modified: debtorrent/trunk/DebTorrent/BT1/track.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/track.py?rev=269&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/track.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/track.py Sun Aug 19 02:14:33 2007
@@ -55,7 +55,21 @@
 logger = logging.getLogger('DebTorrent.BT1.track')
 
 defaults = [
-    ('port', 80, "Port to listen on."),
+    # Not in the config file
+    ('configfile', '', 'the configuration file to use, if not specified then ' +
+        'a file in /etc/debtorrent will be used, followed by ' +
+        'a file in the .DebTorrent directory in the user\'s home directory'),
+    # Locations
+    ('cache_dir', '', 'the directory to use to get/store cache files, if not ' + 
+        'specified then a .DebTorrent directory in the user\'s home directory ' +
+        'will be used'),
+    ('save_state_interval', 5 * 60, 'seconds between saving state to a file'),
+    ('log_dir', '',
+        'directory to write the logfiles to (default is to use the cache directory)'),
+    ('log_level', 10,
+        'level to write the logfiles at, varies from 10 (debug) to 50 (critical)'),
+    # Connections
+    ('port', 80, "port to listen on"),
     ('bind', '', 'comma-separated list of ips/hostnames to bind to locally'),
 #    ('ipv6_enabled', autodetect_ipv6(),
     ('ipv6_enabled', 0,
@@ -63,21 +77,45 @@
     ('ipv6_binds_v4', autodetect_socket_style(),
         'set if an IPv6 server socket will also field IPv4 connections'),
     ('socket_timeout', 15, 'timeout for closing connections'),
-    ('save_state_interval', 5 * 60, 'seconds between saving state to a file'),
-    ('timeout_downloaders_interval', 45 * 60, 'seconds between expiring downloaders'),
-    ('reannounce_interval', 30 * 60, 'seconds downloaders should wait between reannouncements'),
-    ('response_size', 50, 'number of peers to send in an info message'),
     ('timeout_check_interval', 5,
         'time to wait between checking if any connections have timed out'),
-    ('nat_check', 3,
-        "how many times to check if a downloader is behind a NAT (0 = don't check)"),
-    ('min_time_between_log_flushes', 3.0,
-        'minimum time it must have been since the last flush to do another one'),
-    ('min_time_between_cache_refreshes', 600.0,
-        'minimum time in seconds before a cache is considered stale and is flushed'),
+    # Allowed Torrents and Peers
     ('allowed_dir', '', 'only allow downloads for .dtorrents in this dir'),
     ('allowed_list', '', 'only allow downloads for hashes in this list (hex format, one per line)'),
     ('allowed_controls', 0, 'allow special keys in torrents in the allowed_dir to affect tracker access'),
+    ('allowed_ips', '', 'only allow connections from IPs specified in the given file; '+
+             'file contains subnet data in the format: aa.bb.cc.dd/len'),
+    ('banned_ips', '', "don't allow connections from IPs specified in the given file; "+
+             'file contains IP range data in the format: xxx:xxx:ip1-ip2'),
+    ('parse_dir_interval', 60, 'seconds between reloading of allowed_dir or allowed_file ' +
+             'and allowed_ips and banned_ips lists'),
+    # Peer Requests
+    ('compact_reqd', 1, "only allow peers that accept a compact response"),
+    ('reannounce_interval', 30 * 60, 'seconds downloaders should wait between reannouncements'),
+    ('response_size', 50, 'number of peers to send in an info message'),
+    ('nat_check', 3,
+        "how many times to check if a downloader is behind a NAT (0 = don't check)"),
+    ('timeout_downloaders_interval', 45 * 60, 'seconds between expiring downloaders'),
+    ('min_time_between_cache_refreshes', 600.0,
+        'minimum time in seconds before a cache is considered stale and is flushed'),
+    ('only_local_override_ip', 2, "ignore the ip GET parameter from machines which aren't on local network IPs " +
+             "(0 = never, 1 = always, 2 = ignore if NAT checking is not enabled)"),
+    ('dedicated_seed_id', '', 'allows tracker to monitor dedicated seed(s) and flag torrents as seeded'),
+    # Non-Peer Requests
+    ('show_infopage', 1, "whether to display an info page when the tracker's root dir is loaded"),
+    ('infopage_redirect', '', 'a URL to redirect the info page to'),
+    ('favicon', '', 'file containing x-icon data to return when browser requests favicon.ico'),
+    ('show_names', 1, 'whether to display names from allowed dir'),
+    ('allow_get', 0, 'use with allowed_dir; adds a /file?hash={hash} url that allows users to download the torrent file'),
+    ('keep_dead', 0, 'keep dead torrents after they expire (so they still show up on your scrape and web page)'),
+    ('scrape_allowed', 'full', 'scrape access allowed (can be none, specific or full)'),
+    # Request Logging
+    ('min_time_between_log_flushes', 3.0,
+        'minimum time it must have been since the last flush to do another one'),
+    ('hupmonitor', 0, 'whether to reopen the log file upon receipt of HUP signal'),
+    ('log_nat_checks', 0,
+        "whether to add entries to the log for nat-check results"),
+    # Multi-Tracker
     ('multitracker_enabled', 0, 'whether to enable multitracker operation'),
     ('multitracker_allowed', 'autodetect', 'whether to allow incoming tracker announces (can be none, autodetect or all)'),
     ('multitracker_reannounce_interval', 2 * 60, 'seconds between outgoing tracker announces'),
@@ -85,33 +123,8 @@
     ('aggregate_forward', '', 'format: <url>[,<password>] - if set, forwards all non-multitracker to this url with this optional password'),
     ('aggregator', '0', 'whether to act as a data aggregator rather than a tracker.  If enabled, may be 1, or <password>; ' +
              'if password is set, then an incoming password is required for access'),
-    ('hupmonitor', 0, 'whether to reopen the log file upon receipt of HUP signal'),
     ('http_timeout', 60, 
-        'number of seconds to wait before assuming that an http connection has timed out'),
-    ('parse_dir_interval', 60, 'seconds between reloading of allowed_dir or allowed_file ' +
-             'and allowed_ips and banned_ips lists'),
-    ('show_infopage', 1, "whether to display an info page when the tracker's root dir is loaded"),
-    ('infopage_redirect', '', 'a URL to redirect the info page to'),
-    ('show_names', 1, 'whether to display names from allowed dir'),
-    ('favicon', '', 'file containing x-icon data to return when browser requests favicon.ico'),
-    ('allowed_ips', '', 'only allow connections from IPs specified in the given file; '+
-             'file contains subnet data in the format: aa.bb.cc.dd/len'),
-    ('banned_ips', '', "don't allow connections from IPs specified in the given file; "+
-             'file contains IP range data in the format: xxx:xxx:ip1-ip2'),
-    ('only_local_override_ip', 2, "ignore the ip GET parameter from machines which aren't on local network IPs " +
-             "(0 = never, 1 = always, 2 = ignore if NAT checking is not enabled)"),
-    ('cache_dir', '', 'the directory to use to get/store cache files, if not ' + 
-        'specified then a .DebTorrent directory in the user\'s home directory ' +
-        'will be used'),
-    ('log_dir', '',
-        'directory to write the logfiles to (default is to use the cache directory)'),
-    ('log_level', 30,
-        'level to write the logfiles at, varies from 10 (debug) to 50 (critical)'),
-    ('allow_get', 0, 'use with allowed_dir; adds a /file?hash={hash} url that allows users to download the torrent file'),
-    ('keep_dead', 0, 'keep dead torrents after they expire (so they still show up on your /scrape and web page)'),
-    ('scrape_allowed', 'full', 'scrape access allowed (can be none, specific or full)'),
-    ('dedicated_seed_id', '', 'allows tracker to monitor dedicated seed(s) and flag torrents as seeded'),
-    ('compact_reqd', 1, "only allow peers that accept a compact response"),
+        'number of seconds to wait before assuming that an http connection to another tracker has timed out'),
   ]
 
 def statefiletemplate(x):
@@ -1471,7 +1484,7 @@
     configdefaults = {}
     try:
         # Load the configuration data
-        configdir = ConfigDir('debtorrent-client')
+        configdir = ConfigDir('debtorrent-tracker')
         defaultsToIgnore = ['configfile']
         configdir.setDefaults(defaults,defaultsToIgnore)
         configdefaults = configdir.loadConfig(params)

Modified: debtorrent/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/changelog?rev=269&op=diff
==============================================================================
--- debtorrent/trunk/debian/changelog (original)
+++ debtorrent/trunk/debian/changelog Sun Aug 19 02:14:33 2007
@@ -6,6 +6,7 @@
     (see the new apt-transport-debtorrent package)
   * Make the Packages decompression and torrent creation threaded
   * Improve the startup initialization of files
+  * Add init and configuration files for the tracker
   * bug fixes:
     - restarts would fail when downloaded files have been modified
     - deleting old cached data would fail

Modified: debtorrent/trunk/debian/debtorrent-client.init
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/debtorrent-client.init?rev=269&op=diff
==============================================================================
--- debtorrent/trunk/debian/debtorrent-client.init (original)
+++ debtorrent/trunk/debian/debtorrent-client.init Sun Aug 19 02:14:33 2007
@@ -15,7 +15,7 @@
 #                    This provides the debtorrent daemon client.
 ### END INIT INFO
 
-# /etc/init.d/debtorrent: start and stop the debtorrent client daemon
+# /etc/init.d/debtorrent-client: start and stop the debtorrent client daemon
 
 DAEMON=/usr/bin/debtorrent-client
 NAME="debtorrent-client"

Modified: debtorrent/trunk/debian/debtorrent-client.sgml
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/debtorrent-client.sgml?rev=269&op=diff
==============================================================================
--- debtorrent/trunk/debian/debtorrent-client.sgml (original)
+++ debtorrent/trunk/debian/debtorrent-client.sgml Sun Aug 19 02:14:33 2007
@@ -75,7 +75,8 @@
 
     <para>These programs follow the usual &gnu; command line syntax,
       with long options starting with two dashes (`--').  A summary of
-      options is included below.</para>
+      options is included below. For more detail, see the configuration
+      file in /etc/debtorrent.</para>
     
   <refsect2>
     <title>CONFIG FILES</title>
@@ -135,7 +136,7 @@
         <listitem>
           <para>log messages that are greater than or equal to <replaceable>level</replaceable> to log files, 
             the basic log levels are 50 (critical), 40 (errors), 30 (warnings), 20 (info), and 10 (debug)
-            (the default is 30)</para>
+            (the default is 10)</para>
         </listitem>
       </varlistentry>
     </variablelist>

Added: debtorrent/trunk/debian/debtorrent-tracker.default
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/debtorrent-tracker.default?rev=269&op=file
==============================================================================
--- debtorrent/trunk/debian/debtorrent-tracker.default (added)
+++ debtorrent/trunk/debian/debtorrent-tracker.default Sun Aug 19 02:14:33 2007
@@ -1,0 +1,51 @@
+###############################################################################
+#                T R A C K E R   D A E M O N   D E F A U L T S
+###############################################################################
+#
+# This file specifies some default options to use when running the
+# debtorrent-tracker daemon from the init.d script.
+#
+
+#
+# Enable
+#
+# Whether to start the debtorrent-tracker in daemon mode from the init.d
+# script. The only allowed values are "true" and "false".
+#
+
+DEBTORRENT_TRACKER_ENABLE=false
+
+#
+# User
+#
+# The user to run the debtorrent-tracker daemon as.
+#
+
+DEBTORRENT_TRACKER_USER=debtorrent
+
+#
+# Configuration File
+#
+# The configuration file to use. If left blank then a file in the .DebTorrent
+# directory in the user's home directory will be used.
+#
+
+DEBTORRENT_TRACKER_CONFIG_FILE=/etc/debtorrent/debtorrent-tracker.conf
+
+#
+# Cache Directory
+#
+# The directory to use to get/store cache files. If left blank then a
+# .DebTorrent directory in the user's home directory will be used.
+#
+
+DEBTORRENT_TRACKER_CACHE_DIR=/var/cache/debtorrent/.DebTorrent
+
+#
+# Log Directory
+#
+# The directory to write the output logs to. If left blank, the cache
+# directory will be used.
+#
+
+DEBTORRENT_TRACKER_LOG_DIR=/var/log/debtorrent

Added: debtorrent/trunk/debian/debtorrent-tracker.init
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/debtorrent-tracker.init?rev=269&op=file
==============================================================================
--- debtorrent/trunk/debian/debtorrent-tracker.init (added)
+++ debtorrent/trunk/debian/debtorrent-tracker.init Sun Aug 19 02:14:33 2007
@@ -1,0 +1,128 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Provides:          debtorrent-tracker
+# Required-Start:    $network
+# Required-Stop:     
+# Should-Start:      $named
+# Should-Stop:       
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: debtorrent tracker for connecting peers
+# Description:       debtorrent is a program that proxies requests from
+#                    APT to download packages and instead uses a 
+#                    bittorrent-like peer-to-peer method to download them.
+#                    This provides the debtorrent daemon tracker.
+### END INIT INFO
+
+# /etc/init.d/debtorrent-tracker: start and stop the debtorrent tracker daemon
+
+DAEMON=/usr/bin/debtorrent-tracker
+NAME="debtorrent-tracker"
+DEFAULTSFILE=/etc/default/debtorrent-tracker
+PIDFILE=/var/run/debtorrent-tracker.pid
+
+DEBTORRENT_TRACKER_ENABLE=false
+DEBTORRENT_TRACKER_USER=debtorrent
+DEBTORRENT_TRACKER_CONFIG_FILE=/etc/debtorrent/debtorrent-tracker.conf
+DEBTORRENT_TRACKER_CACHE_DIR=/var/cache/debtorrent/.DebTorrent
+DEBTORRENT_TRACKER_LOG_DIR=/var/log/debtorrent
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+. /etc/default/rcS
+
+if [ -s $DEFAULTSFILE ]; then
+    . $DEFAULTSFILE
+    case "x$DEBTORRENT_TRACKER_ENABLE" in
+        xtrue|xfalse)   ;;
+        *)              log_failure_msg "Value of DEBTORRENT_TRACKER_ENABLE in $DEFAULTSFILE must be either 'true' or 'false';"
+                        log_failure_msg "not starting $NAME daemon."
+                        exit 1
+                        ;;
+    esac
+    case "x$DEBTORRENT_TRACKER_USER" in
+        x)              log_warning_msg "Value of DEBTORRENT_TRACKER_USER in $DEFAULTSFILE must be a valid user;"
+                        log_failure_msg "not starting $NAME daemon."
+                        exit 1
+                        ;;
+    esac
+fi
+
+export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
+
+case "$1" in
+  start)
+    if "$DEBTORRENT_TRACKER_ENABLE"; then
+        log_daemon_msg "Starting $NAME daemon" "$NAME"
+        if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
+                log_progress_msg "apparently already running"
+                log_end_msg 0
+        exit 0
+        fi
+        if [ ! -s "$DEBTORRENT_TRACKER_CONFIG_FILE" ]; then
+            log_failure_msg "missing or empty config file $DEBTORRENT_TRACKER_CONFIG_FILE"
+            log_end_msg 1
+            exit 1
+        fi
+        start-stop-daemon --start --quiet --background \
+            --pidfile $PIDFILE --make-pidfile --chuid $DEBTORRENT_TRACKER_USER \
+            --exec $DAEMON \
+            -- --configfile "$DEBTORRENT_TRACKER_CONFIG_FILE" \
+               --cache_dir "$DEBTORRENT_TRACKER_CACHE_DIR" \
+               --log_dir "$DEBTORRENT_TRACKER_LOG_DIR"
+        log_end_msg $?
+    else
+        if [ -s "$DEBTORRENT_TRACKER_CONFIG_FILE" ]; then
+            [ "$VERBOSE" != no ] && log_warning_msg "$NAME daemon not enabled in $DEFAULTSFILE, not starting..."
+        fi
+    fi
+    ;;
+  stop)
+    log_daemon_msg "Stopping $NAME daemon" "$NAME"
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
+		--retry INT/15/TERM/5/KILL/5
+    log_end_msg $?
+    rm -f $PIDFILE
+    ;;
+
+  reload)
+    log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
+    log_warning_msg "cannot re-read the config file (use restart)."
+    ;;
+
+  restart|force-reload)
+    set +e
+    if $DEBTORRENT_TRACKER_ENABLE; then
+        log_daemon_msg "Restarting $NAME daemon" "$NAME"
+	    if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
+		    start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
+		    	--retry INT/15/TERM/5/KILL/5 || true
+		    sleep 1
+	    else
+    	    rm -f $PIDFILE
+	    fi
+        if start-stop-daemon --start --quiet --background \
+	        --pidfile $PIDFILE --make-pidfile --chuid $DEBTORRENT_TRACKER_USER \
+	        --exec $DAEMON \
+	        -- --configfile "$DEBTORRENT_TRACKER_CONFIG_FILE" \
+	           --cache_dir "$DEBTORRENT_TRACKER_CACHE_DIR" \
+	           --log_dir "$DEBTORRENT_TRACKER_LOG_DIR"
+        then
+            log_end_msg 0
+        else
+            log_end_msg 1
+            rm -f $PIDFILE
+        fi
+    else
+        [ "$VERBOSE" != no ] && log_warning_msg "$NAME daemon not enabled in $DEFAULTSFILE, not starting..."
+    fi
+    ;;
+
+  *)
+    echo "Usage: /etc/init.d/debtorrent-tracker {start|stop|reload|force-reload|restart}"
+    exit 1
+esac
+
+exit 0

Propchange: debtorrent/trunk/debian/debtorrent-tracker.init
------------------------------------------------------------------------------
    svn:executable = *

Modified: debtorrent/trunk/debian/debtorrent-tracker.sgml
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/debtorrent-tracker.sgml?rev=269&op=diff
==============================================================================
--- debtorrent/trunk/debian/debtorrent-tracker.sgml (original)
+++ debtorrent/trunk/debian/debtorrent-tracker.sgml Sun Aug 19 02:14:33 2007
@@ -63,23 +63,70 @@
       of the completion of each client, and communicates that information when
       requested to other clients.</para>
 
-    <para>There is one required option, --dfile, which specifies what <replaceable>file</replaceable> to store the recent downloader information.</para>
-
   </refsect1>
   <refsect1>
     <title>OPTIONS</title>
 
     <para>These programs follow the usual &gnu; command line syntax,
       with long options starting with two dashes (`--').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>--dfile <replaceable>file</replaceable></option></term>
-        <listitem>
-          <para>the <replaceable>file</replaceable> to store the recent downloader information (required)</para>
-        </listitem>
-      </varlistentry>
+      options is included below. For more detail, see the configuration
+      file in /etc/debtorrent.</para>
+
+  <refsect2>
+    <title>CONFIG FILES</title>
+    <variablelist>
+      <varlistentry>
+        <term><option>--configfile <replaceable>filename</replaceable></option></term>
+         <listitem>
+          <para>the <replaceable>filename</replaceable> to use for the configuration file, if not specified then a file in
+            /etc/debtorrent will be used, followed by a file in the .DebTorrent directory in the user's home directory</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--save_options</option> 0|1</term>
+        <listitem>
+          <para>whether to save the current options as the new default configuration
+            for the current program (defaults to 0)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect2>
+
+  <refsect2>
+    <title>LOCATIONS</title>
+    <variablelist>
+      <varlistentry>
+        <term><option>--cache_dir <replaceable>directory</replaceable></option></term>
+        <listitem>
+          <para>the local <replaceable>directory</replaceable> to save cache data in, if left blank then a .DebTorrent directory in the user's home directory will be used</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--save_dfile_interval <replaceable>seconds</replaceable></option></term>
+        <listitem>
+          <para>the number of <replaceable>seconds</replaceable> between saving the dfile (defaults to 300)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--log_dir <replaceable>directory</replaceable></option></term>
+        <listitem>
+          <para>the local <replaceable>directory</replaceable> to save log files in, if left blank then the cache directory will be used</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--log_level <replaceable>level</replaceable></option></term>
+        <listitem>
+          <para>log messages that are greater than or equal to <replaceable>level</replaceable> to log files, 
+            the basic log levels are 50 (critical), 40 (errors), 30 (warnings), 20 (info), and 10 (debug)
+            (the default is 10)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect2>
+
+  <refsect2>
+    <title>CONNECTIONS</title>
+    <variablelist>
       <varlistentry>
         <term><option>--port <replaceable>port</replaceable></option></term>
         <listitem>
@@ -95,31 +142,84 @@
       <varlistentry>
         <term><option>--ipv6_enabled</option> 0|1</term>
         <listitem>
-          <para>whether to allow the tracker to connect to peers via IPv6 (defaults to 0)</para>
+          <para>whether to allow the client to connect to peers via IPv6 (defaults to 0)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term><option>--ipv6_binds_v4</option> 0|1</term>
         <listitem>
-          <para>whether an IPv6 server socket will also field IPv4 connections (defaults to 0)</para>
+          <para>set if an IPv6 server socket won't also field IPv4 connections (defaults to 0)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term><option>--socket_timeout <replaceable>seconds</replaceable></option></term>
         <listitem>
-          <para>then number of <replaceable>seconds</replaceable> to use as a timeout for closing connections (defaults to 15)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--save_dfile_interval <replaceable>seconds</replaceable></option></term>
-        <listitem>
-          <para>the number of <replaceable>seconds</replaceable> between saving the dfile (defaults to 300)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--timeout_downloaders_interval <replaceable>seconds</replaceable></option></term>
-        <listitem>
-          <para>the number of <replaceable>seconds</replaceable> between expiring downloaders (defaults to 2700)</para>
+          <para>the number of <replaceable>seconds</replaceable> to wait between closing sockets which nothing has been received on
+        (defaults to 15)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--timeout_check_interval <replaceable>seconds</replaceable></option></term>
+        <listitem>
+          <para>the number of <replaceable>seconds</replaceable> to wait between checking if any connections have timed out (defaults to 5)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect2>
+
+  <refsect2>
+    <title>ALLOWED TORRENTS AND PEERS</title>
+    <variablelist>
+      <varlistentry>
+        <term><option>--allowed_dir <replaceable>directory</replaceable></option></term>
+        <listitem>
+          <para>only allow downloads for torrents in this <replaceable>directory</replaceable> (defaults to '')</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--allowed_list <replaceable>file</replaceable></option></term>
+        <listitem>
+          <para>only allow downloads for hashes in this <replaceable>file</replaceable> (hex format, one per
+	    line), cannot be used with allowed_dir (defaults to '')</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--allowed_controls</option> 0|1</term>
+        <listitem>
+          <para>whether to allow special keys in torrents in the allowed_dir to affect tracker
+	    access (defaults to 0)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--allowed_ips <replaceable>file</replaceable></option></term>
+        <listitem>
+          <para>only allow connections from IPs specified in the given <replaceable>file</replaceable>, which
+        contains subnet data in the format: aa.bb.cc.dd/len (defaults to '')</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--banned_ips <replaceable>file</replaceable></option></term>
+        <listitem>
+          <para>don't allow connections from IPs specified in the given <replaceable>file</replaceable>, which
+        contains IP range data in the format: xxx:xxx:ip1-ip2 (defaults to '')</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--parse_dir_interval <replaceable>seconds</replaceable></option></term>
+        <listitem>
+          <para>number of <replaceable>seconds</replaceable> between reloading of allowed_dir (defaults to 60)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect2>
+
+  <refsect2>
+    <title>PEER REQUESTS</title>
+    <variablelist>
+      <varlistentry>
+        <term><option>--compact_reqd</option> 0|1</term>
+        <listitem>
+          <para>whether to only allow peers that accept a compact response (defaults to 1)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -136,13 +236,6 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--timeout_check_interval <replaceable>seconds</replaceable></option></term>
-        <listitem>
-          <para>the number of <replaceable>seconds</replaceable> to wait between checking if any connections have timed out
-	    (defaults to 5)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term><option>--nat_check <replaceable>num</replaceable></option></term>
         <listitem>
           <para>check <replaceable>num</replaceable> times if a downloader is behind a NAT (0 = don't
@@ -150,16 +243,9 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--log_nat_checks</option> 0|1</term>
-        <listitem>
-          <para>whether to add entries to the log for nat-check results (defaults to 0)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--min_time_between_log_flushes <replaceable>seconds</replaceable></option></term>
-        <listitem>
-          <para>the minimum number of <replaceable>seconds</replaceable> it must have been since the last flush to do another one
-	    (defaults to 3.0)</para>
+        <term><option>--timeout_downloaders_interval <replaceable>seconds</replaceable></option></term>
+        <listitem>
+          <para>the number of <replaceable>seconds</replaceable> between expiring downloaders (defaults to 2700)</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -167,125 +253,6 @@
         <listitem>
           <para>the minimum number of <replaceable>seconds</replaceable> before a cache is considered stale and is
 	    flushed (defaults to 600.0)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--allowed_dir <replaceable>directory</replaceable></option></term>
-        <listitem>
-          <para>only allow downloads for torrents in this <replaceable>directory</replaceable> (defaults to '')</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--allowed_list <replaceable>file</replaceable></option></term>
-        <listitem>
-          <para>only allow downloads for hashes in this <replaceable>file</replaceable> (hex format, one per
-	    line), cannot be used with allowed_dir (defaults to '')</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--allowed_controls</option> 0|1</term>
-        <listitem>
-          <para>whether to allow special keys in torrents in the allowed_dir to affect tracker
-	    access (defaults to 0)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--multitracker_enabled</option> 0|1</term>
-        <listitem>
-          <para>whether to enable multitracker operation (defaults to 0)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--multitracker_allowed</option> autodetect|none|all</term>
-        <listitem>
-          <para>whether to allow incoming tracker announces (can be none, autodetect
-	    or all) (defaults to 'autodetect')</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--multitracker_reannounce_interval <replaceable>seconds</replaceable></option></term>
-        <listitem>
-          <para>number of <replaceable>seconds</replaceable> between outgoing tracker announces (defaults to 120)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--multitracker_maxpeers <replaceable>num</replaceable></option></term>
-        <listitem>
-          <para>the <replaceable>num</replaceable> of peers to get in a tracker announce (defaults to 20)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--aggregate_forward <replaceable>url</replaceable>[,<replaceable>password</replaceable>]</option></term>
-        <listitem>
-          <para>if set, forwards all non-multitracker to
-	    this <replaceable>url</replaceable> with this optional <replaceable>password</replaceable> (defaults to '')</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--aggregator</option> 0|1|<replaceable>password</replaceable></term>
-        <listitem>
-          <para>whether to act as a data aggregator rather than a tracker. If
-	    enabled, may be 1, or <replaceable>password</replaceable>; if <replaceable>password</replaceable> is set, then an
-	      incoming password is required for access (defaults to '0')</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--hupmonitor</option> 0|1</term>
-        <listitem>
-          <para>whether to reopen the log file upon receipt of HUP signal (defaults to 0)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--http_timeout <replaceable>seconds</replaceable></option></term>
-        <listitem>
-          <para>number of <replaceable>seconds</replaceable> to wait before assuming that an http connection has
-	    timed out (defaults to 60)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--parse_dir_interval <replaceable>seconds</replaceable></option></term>
-        <listitem>
-          <para>number of <replaceable>seconds</replaceable> between reloading of allowed_dir (defaults to 60)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--show_infopage</option> 0|1</term>
-        <listitem>
-          <para>whether to display an info page when the tracker's root dir is loaded
-	    (defaults to 1)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--infopage_redirect <replaceable>URL</replaceable></option></term>
-        <listitem>
-          <para>redirect the info page to this <replaceable>URL</replaceable> (defaults to '')</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--show_names</option> 0|1</term>
-        <listitem>
-          <para>whether to display names from allowed dir (defaults to 1)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--favicon <replaceable>filename</replaceable></option></term>
-        <listitem>
-          <para>the <replaceable>filename</replaceable> containing x-icon data to return when browser requests
-	    favicon.ico (defaults to '')</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--allowed_ips <replaceable>file</replaceable></option></term>
-        <listitem>
-          <para>only allow connections from IPs specified in the given <replaceable>file</replaceable>, which
-	    contains subnet data in the format: aa.bb.cc.dd/len (defaults to '')</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--banned_ips <replaceable>file</replaceable></option></term>
-        <listitem>
-          <para>don't allow connections from IPs specified in the given <replaceable>file</replaceable>, which
-	    contains IP range data in the format: xxx:xxx:ip1-ip2 (defaults to '')</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -295,32 +262,6 @@
 	    network IPs (0 = never, 1 = always, 2 = ignore if NAT checking is not
 	    enabled) (defaults to 2)</para>
         </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--logfile <replaceable>file</replaceable></option></term>
-        <listitem>
-          <para>write tracker logs to this <replaceable>file</replaceable>, use '-' for stdout (defaults to '-')</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--allow_get</option> 0|1</term>
-        <listitem>
-          <para>use with allowed_dir; adds a /file?hash=<replaceable>hash</replaceable> URL that allows users
-	    to download the torrent file (defaults to 0)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--keep_dead</option> 0|1</term>
-        <listitem>
-          <para>keep dead torrents after they expire (so they still show up on your
-	    /scrape and web page) (defaults to 0)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--scrape_allowed</option> full|specific|none</term>
-        <listitem>
-          <para>scrape access allowed (can be none, specific or full) (defaults to full)</para>
-	</listitem>
       </varlistentry>
       <varlistentry>
         <term><option>--dedicated_seed_id <replaceable>code</replaceable></option></term>
@@ -331,6 +272,138 @@
 	</listitem>
       </varlistentry>
     </variablelist>
+  </refsect2>
+
+  <refsect2>
+    <title>NON-PEER REQUESTS</title>
+    <variablelist>
+      <varlistentry>
+        <term><option>--show_infopage</option> 0|1</term>
+        <listitem>
+          <para>whether to display an info page when the tracker's root dir is loaded
+        (defaults to 1)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--infopage_redirect <replaceable>URL</replaceable></option></term>
+        <listitem>
+          <para>redirect the info page to this <replaceable>URL</replaceable> (defaults to '')</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--favicon <replaceable>filename</replaceable></option></term>
+        <listitem>
+          <para>the <replaceable>filename</replaceable> containing x-icon data to return when browser requests
+        favicon.ico (defaults to '')</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--show_names</option> 0|1</term>
+        <listitem>
+          <para>whether to display the name of the torrent on the infopage (defaults to 1)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--allow_get</option> 0|1</term>
+        <listitem>
+          <para>use with allowed_dir; adds a /file?hash=<replaceable>hash</replaceable> URL that allows users
+        to download the torrent file (defaults to 0)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--keep_dead</option> 0|1</term>
+        <listitem>
+          <para>keep dead torrents after they expire (so they still show up on your
+	    scrape and web page) (defaults to 0)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--scrape_allowed</option> full|specific|none</term>
+        <listitem>
+          <para>scrape access allowed (can be none, specific or full) (defaults to full)</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect2>
+
+  <refsect2>
+    <title>REQUEST LOGGING</title>
+    <variablelist>
+      <varlistentry>
+        <term><option>--min_time_between_log_flushes <replaceable>seconds</replaceable></option></term>
+        <listitem>
+          <para>the minimum number of <replaceable>seconds</replaceable> it must have been since the last flush to do another one
+        (defaults to 3.0)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--hupmonitor</option> 0|1</term>
+        <listitem>
+          <para>whether to reopen the log file upon receipt of HUP signal (defaults to 0)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--log_nat_checks</option> 0|1</term>
+        <listitem>
+          <para>whether to add entries to the log for nat-check results (defaults to 0)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect2>
+
+  <refsect2>
+    <title>MULTI-TRACKER</title>
+    <variablelist>
+      <varlistentry>
+        <term><option>--multitracker_enabled</option> 0|1</term>
+        <listitem>
+          <para>whether to enable multitracker operation (defaults to 0)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--multitracker_allowed</option> autodetect|none|all</term>
+        <listitem>
+          <para>whether to allow incoming tracker announces (can be none, autodetect
+	    or all) (defaults to 'autodetect')</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--multitracker_reannounce_interval <replaceable>seconds</replaceable></option></term>
+        <listitem>
+          <para>number of <replaceable>seconds</replaceable> between outgoing tracker announces (defaults to 120)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--multitracker_maxpeers <replaceable>num</replaceable></option></term>
+        <listitem>
+          <para>the <replaceable>num</replaceable> of peers to get in a tracker announce (defaults to 20)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--aggregate_forward <replaceable>url</replaceable>[,<replaceable>password</replaceable>]</option></term>
+        <listitem>
+          <para>if set, forwards all non-multitracker to
+	    this <replaceable>url</replaceable> with this optional <replaceable>password</replaceable> (defaults to '')</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--aggregator</option> 0|1|<replaceable>password</replaceable></term>
+        <listitem>
+          <para>whether to act as a data aggregator rather than a tracker. If
+	    enabled, may be 1, or <replaceable>password</replaceable>; if <replaceable>password</replaceable> is set, then an
+	      incoming password is required for access (defaults to '0')</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--http_timeout <replaceable>seconds</replaceable></option></term>
+        <listitem>
+          <para>number of <replaceable>seconds</replaceable> to wait before assuming that an http connection has
+	    timed out (defaults to 60)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect2>
+
   </refsect1>
 
   <refsect1>

Modified: debtorrent/trunk/debian/debtorrent.install
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/debtorrent.install?rev=269&op=diff
==============================================================================
--- debtorrent/trunk/debian/debtorrent.install (original)
+++ debtorrent/trunk/debian/debtorrent.install Sun Aug 19 02:14:33 2007
@@ -1,1 +1,2 @@
 debtorrent-client.conf etc/debtorrent
+debtorrent-tracker.conf etc/debtorrent

Modified: debtorrent/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/rules?rev=269&op=diff
==============================================================================
--- debtorrent/trunk/debian/rules (original)
+++ debtorrent/trunk/debian/rules Sun Aug 19 02:14:33 2007
@@ -53,7 +53,7 @@
 	
 	# Remove the .py from the end of each of these and move them out of
 	# the path
-	for i in test btmakemetafile btcompletedir btreannounce \
+	for i in test hippy btmakemetafile btcompletedir btreannounce \
 		btrename btshowmetainfo btcopyannounce btsetdebmirrors; \
 	do mv debian/debtorrent/usr/bin/$$i.py debian/debtorrent/usr/share/debtorrent/$$i; done
 
@@ -68,6 +68,7 @@
 	dh_fixperms
 	dh_pysupport
 	dh_installinit --name=debtorrent-client
+	dh_installinit --name=debtorrent-tracker
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol

Added: debtorrent/trunk/debtorrent-tracker.conf
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debtorrent-tracker.conf?rev=269&op=file
==============================================================================
--- debtorrent/trunk/debtorrent-tracker.conf (added)
+++ debtorrent/trunk/debtorrent-tracker.conf Sun Aug 19 02:14:33 2007
@@ -1,0 +1,438 @@
+###############################################################################
+#       D E B T O R R E N T   T R A C K E R   C O N F I G U R A T I O N
+###############################################################################
+#
+# This is a Windows-style INI file for configuring the DebTorrent tracker.
+#
+# Values that are strings are written surrounded by quotes, and the decoding
+# routine automatically strips any quotes from the values. Booleans are 
+# written as integers, with 0 being false, anything else is true. Decimal
+# numbers are read in as floats. Anything other than strings, integers, and 
+# floats may have unpredictable results. Lines beginning with a '#' are
+# considered comments and are ignored, as are blank lines. There are no 
+# sections, all configuration variables are global.
+#
+# This file should be placed in /etc/debtorrent
+#
+# $Id: debtorrent-client.conf 193 2007-07-31 05:37:26Z camrdale-guest $
+#
+
+###############################################################################
+#                              L O C A T I O N S
+###############################################################################
+#
+# Cache Directory
+#
+# The directory to use to get/store cache files. If left blank then a
+# .DebTorrent directory in the user's home directory will be used.
+#
+
+# cache_dir = ""
+
+#
+# Save State Interval
+#
+# The number of seconds between saving the current state to a file. The state
+# file will be placed in the cache directory and used in case of a crash or
+# restart to load the previous state.
+#
+
+# save_state_interval = 300
+
+#
+# Log Directory
+#
+# The directory to write the output logs to. If left blank, the cache
+# directory will be used.
+#
+
+# log_dir = ""
+
+#
+# Log Level
+#
+# The log level to write output logs at. The possible values are:
+#
+#         50 -- Critical
+#         40 -- Error
+#         30 -- Warn (default)
+#         20 -- Info
+#         10 -- Debug
+#
+
+# log_level = 10
+
+###############################################################################
+#                             C O N N E C T I O N S
+###############################################################################
+#
+# Port
+#
+# The port to listen for requests on.
+#
+
+# port = 80
+
+#
+# Bind
+#
+# A comma-separated list of IPs and hostnames to bind to listen on locally.
+# Leaving this blank will cause it to listen on all IPs and hostnames.
+#
+
+# bind = ""
+
+#
+# IPv6 Enabled
+#
+# Allow the client to connect to peers via IPv6.
+#
+
+# ipv6_enabled = 0
+
+#
+# IPv6 Binds v4
+#
+# Whether an IPv6 server socket will also field IPv4 connections.
+#
+
+# ipv6_binds_v4 = 0
+
+#
+# Socket Timeout
+#
+# Time to wait between closing sockets which nothing has been received on
+# (in seconds).
+#
+
+# socket_timeout = 15
+
+#
+# Timeout Check Interval
+#
+# Time to wait between checking if any connections have timed out (in seconds).
+#
+
+# timeout_check_interval = 5
+
+###############################################################################
+#           A L L O W E D   T O R R E N T S   A N D   P E E R S
+###############################################################################
+#
+# Allowed Dir
+#
+# Only allow tracking of torrents that are found in this directory.
+#
+
+# allowed_dir = ""
+
+#
+# Allowed List
+#
+# Only allow tracking of torrents whose info hashes are listed in this file.
+# The hashes should be the 40-byte hex version of the SHA1 hash, with one
+# hash per line in the file.
+#
+
+# allowed_list = ""
+
+#
+# Allowed Controls
+#
+# Allow special keys in torrents in the allowed_dir to affect tracker access.
+# The string with key 'warning message' will be sent to all peers requesting
+# data for this torrent. If the torrent has the key 'failure reason', no data
+# will be sent to all peers trying to get data for this torrent, and the
+# string value will be sent instead as the reason for the failure.
+#
+
+# allowed_controls = 0
+
+#
+# Allowed IPs
+#
+# A file containing IPs to only allow connections from. The file must contain
+# a single subnet data on each line in the format: 
+#
+#         aa.bb.cc.dd/len
+#
+# Leaving this option empty allows all IPs to connect to the APT listener
+# (except for those listed in the Banned IPs ranges).
+#
+
+# allowed_ips = ""
+
+#
+# Banned IPs
+#
+# A file containing IPs to NOT allow connections from. The file must contain
+# IP range data on each line in the format: 
+#
+#         xxx:xxx:ip1-ip2
+#
+
+# banned_ips = ""
+
+#
+# Parse Dir Interval
+#
+# The number of seconds between reloading of Allowed torrents from the
+# directoryor list, and the Allowed and Banned IP lists.
+#
+
+# parse_dir_interval = 60
+
+###############################################################################
+#                       P E E R   R E Q U E S T S
+###############################################################################
+#
+# Compact Required
+#
+# Whether to only allow peers that accept a compact response. The compact
+# response transmits the peers data in a more compact string format instead
+# of a bencoded dictionary. IPv6 will not work with the compact response.
+#
+
+# compact_reqd = 1
+
+#
+# Reannounce Interval
+#
+# The number of seconds a downloader should wait between reannouncements to
+# the tracker.
+#
+
+# reannounce_interval = 1800
+
+#
+# Response Size
+#
+# The number of peers to send in an announce response message to a peer.
+#
+
+# response_size = 50
+
+#
+# NAT Check
+#
+# How many times to check if a downloader is behind a NAT. Set this to 0 to
+# disable NAT checking.
+#
+
+# nat_check = 3
+
+#
+# Timeout Downloaders Interval
+#
+# The number of seconds since the last announce before a downloader is expired
+# and removed from the list of known peers to send to other downloaders.
+#
+
+# timeout_downloaders_interval = 2700
+
+#
+# Min Time Between Cache Refreshes
+#
+# The minimum time in seconds before a peer cache is considered stale and is
+# flushed. This refers to the cache of peers that are waiting to be sent to
+# the next peer, which is used to speed up the response of the tracker.
+#
+
+# min_time_between_cache_refreshes = 600.0
+
+#
+# Only Local Override IP
+#
+# Ignore the 'ip' GET parameter from machines which aren't on local network
+# IPs. The possible values are:
+#
+#         0 -- never
+#         1 -- always
+#         2 -- ignore if NAT checking is not enabled
+#
+
+# only_local_override_ip = 2
+
+#
+# Dedicated Seed ID
+#
+# Set this to the seed ID that dedicated seeds will use when connecting to the
+# tracker. This allows the tracker to monitor dedicated seed and flag torrents
+# as seeded.
+#
+
+# dedicated_seed_id = ""
+
+###############################################################################
+#                    N O N - P E E R   R E Q U E S T S
+###############################################################################
+#
+# Show InfoPage
+#
+# Whether to display an information and statistics page when the tracker's
+# root dir is loaded. If enabled, the page can be viewed at:
+#
+#         http://tracker:port/
+#
+# where 'port' is the port specified for listening for tracker requests.
+#
+
+# show_infopage = 1
+
+#
+# InfoPage Redirect
+#
+# A URL to redirect the info page to. The Show InfoPage option must be set to
+# True (1) for this to work.
+#
+
+# infopage_redirect = ""
+
+#
+# favicon
+#
+# The file containing x-icon data to return when a browser requests 
+# favicon.ico from the tracker.
+#
+
+# favicon = ""
+
+#
+# Show Names
+#
+# Whether to display the name of the torrent (as opposed to the info hash) for
+# each torrent on the InfoPage. For this to work, the allowed_dir option above
+# must be used so that the tracker can extract the names from the torrent
+# files in it.
+#
+
+# show_names = 1
+
+#
+# Allow Get
+#
+# Add a /file?info_hash=<hash> url that allows users to download the dtorrent
+# file from the tracker's info page.
+#
+
+# allow_get = 0
+
+#
+# Keep Dead
+#
+# Whether to keep dead torrents after they expire (so they still show up on
+# the scrape and web page).
+#
+
+# keep_dead = 0
+
+#
+# Scrape Allowed
+#
+# What type of scrape access to allow. The possible values are:
+#
+#             "none" -- no scrape access is allowed
+#         "specific" -- only scrapes for a specific torrent are allowed
+#             "full" -- scrapes of all torrent data is allowed
+#
+
+# scrape_allowed = "full"
+
+###############################################################################
+#                       R E Q U E S T   L O G G I N G
+###############################################################################
+#
+# Min Time Between Log Flushes
+#
+# The minimum time it must have been since the last log flush to do another 
+# one (in seconds).
+#
+
+# min_time_between_log_flushes = 3.0
+
+#
+# HUP Monitor
+#
+# Whether to reopen the log file upon receipt of a HUP signal.
+#
+
+# hupmonitor = 0
+
+#
+# Log NAT Checks
+#
+# Whether to add entried to the log for NAT check results.
+#
+
+# log_nat_checks = 0
+
+###############################################################################
+#                          M U L T I - T R A C K E R
+###############################################################################
+#
+# Multi-Tracker Enabled
+#
+# Whether to enable multitracker operation.
+#
+
+# multitracker_enabled = 0
+
+#
+# Multi-Tracker Allowed
+#
+# Whether to allow incoming tracker announces from other trackers. The
+# possible values are:
+#
+#               "none" -- no tracker requests from other trackers are allowed
+#         "autodetect" -- only allow if the 'allowed_dir' option is set and
+#                         the torrent being requested has an 'announce-list'
+#                "all" -- all requests are allowed
+#
+
+# multitracker_allowed = "autodetect"
+
+#
+# Multi-Tracker Reannounce Interval
+#
+# The number of seconds between outgoing tracker announces.
+#
+
+# multitracker_reannounce_interval = 120
+
+#
+# Multi-Tracker Max Peers
+#
+# The maximum number of peers to get in a tracker announce.
+#
+
+# multitracker_maxpeers = 20
+
+#
+# Aggregate Forward
+#
+# If set, all non-multitracker requests will be forwarded to this url with
+# this optional password.
+#
+# Format: <url>[,<password>]
+#
+
+# aggregate_forward = ""
+
+#
+# Aggregator
+#
+# Whether to act as a data aggregator rather than a tracker. To enable it, set
+# to 1, or to a string <password> which is the incoming password that is
+# required for access.
+#
+
+# aggregator = 0
+
+#
+# HTTP Timeout
+#
+# The number of seconds to wait before assuming that an HTTP connection to
+# another tracker has timed out.
+#
+
+# http_timeout = 60

Modified: debtorrent/trunk/setup.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/setup.py?rev=269&op=diff
==============================================================================
--- debtorrent/trunk/setup.py (original)
+++ debtorrent/trunk/setup.py Sun Aug 19 02:14:33 2007
@@ -31,7 +31,7 @@
 
     scripts = ["btmakemetafile.py", "btcompletedir.py", "btreannounce.py", 
                "btrename.py", "btshowmetainfo.py", 'btcopyannounce.py',
-               'btsetdebmirrors.py', 'test.py',
+               'btsetdebmirrors.py', 'test.py', 'hippy.py',
                'debtorrent-client.py', 'debtorrent-tracker.py'
         ]
     )




More information about the Debtorrent-commits mailing list