r299 - in /debtorrent/trunk: DebTorrent/download_bt1.py DebTorrent/launchmanycore.py debian/changelog debian/debtorrent-client.sgml debtorrent-client.conf
camrdale-guest at users.alioth.debian.org
camrdale-guest at users.alioth.debian.org
Wed Oct 17 03:48:41 UTC 2007
Author: camrdale-guest
Date: Wed Oct 17 03:48:40 2007
New Revision: 299
URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=299
Log:
* add a new option to bind just the apt listener (Closes: #446959)
Modified:
debtorrent/trunk/DebTorrent/download_bt1.py
debtorrent/trunk/DebTorrent/launchmanycore.py
debtorrent/trunk/debian/changelog
debtorrent/trunk/debian/debtorrent-client.sgml
debtorrent/trunk/debtorrent-client.conf
Modified: debtorrent/trunk/DebTorrent/download_bt1.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/download_bt1.py?rev=299&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/download_bt1.py (original)
+++ debtorrent/trunk/DebTorrent/download_bt1.py Wed Oct 17 03:48:40 2007
@@ -90,7 +90,7 @@
'maximum amount of time to guess the current rate estimate represents'),
('upload_unit_size', 1460,
'when limiting upload rate, how many bytes to send at a time'),
- # Connections
+ # Torrent Connections
('bind', '',
'comma-separated list of ips/hostnames to bind to locally'),
('ip', '',
@@ -118,6 +118,9 @@
'will result in an effectively firewalled state on older trackers'),
# APT Requests
('apt_port', 9988, 'port to listen for apt on'),
+ ('apt_bind', '',
+ 'comma-separated list of ips/hostnames to bind to locally ' +
+ 'to listen for APT requests'),
('show_infopage', 1, 'whether to display an info page when the ' +
'APT requester\'s root directory is loaded'),
('infopage_redirect', '', 'a URL to redirect the info page to'),
Modified: debtorrent/trunk/DebTorrent/launchmanycore.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/launchmanycore.py?rev=299&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/launchmanycore.py (original)
+++ debtorrent/trunk/DebTorrent/launchmanycore.py Wed Oct 17 03:48:40 2007
@@ -365,7 +365,7 @@
logfile = os.path.join(self.configdir.cache_dir, 'apt-access.log')
self.aptlistener = AptListener(self, self.config, self.rawserver)
- self.rawserver.bind(self.config['apt_port'], self.config['bind'],
+ self.rawserver.bind(self.config['apt_port'], self.config['apt_bind'],
reuse = True, ipv6_socket_style = self.config['ipv6_binds_v4'])
self.rawserver.set_handler(HTTPHandler(self.aptlistener.get,
self.config['min_time_between_log_flushes'],
Modified: debtorrent/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/changelog?rev=299&op=diff
==============================================================================
--- debtorrent/trunk/debian/changelog (original)
+++ debtorrent/trunk/debian/changelog Wed Oct 17 03:48:40 2007
@@ -1,3 +1,9 @@
+debtorrent (0.1.4.3) unstable; urgency=low
+
+ * add a new option to bind just the apt listener (Closes: #446959)
+
+ -- Cameron Dale <camrdale at gmail.com> Tue, 16 Oct 2007 20:43:46 -0700
+
debtorrent (0.1.4.2) unstable; urgency=low
* Add logrotate file (Closes: #440510, #446297)
Modified: debtorrent/trunk/debian/debtorrent-client.sgml
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/debtorrent-client.sgml?rev=299&op=diff
==============================================================================
--- debtorrent/trunk/debian/debtorrent-client.sgml (original)
+++ debtorrent/trunk/debian/debtorrent-client.sgml Wed Oct 17 03:48:40 2007
@@ -187,12 +187,13 @@
</refsect2>
<refsect2>
- <title>CONNECTIONS</title>
+ <title>TORRENT CONNECTIONS</title>
<variablelist>
<varlistentry>
<term><option>--bind <replaceable>ip</replaceable>|<replaceable>hostname</replaceable>[,<replaceable>ip</replaceable>|<replaceable>hostname</replaceable> ...]</option></term>
<listitem>
- <para>a comma-separated list of <replaceable>ips</replaceable> and <replaceable>hostnames</replaceable> to bind to locally (defaults to '')</para>
+ <para>a comma-separated list of <replaceable>ips</replaceable> and <replaceable>hostnames</replaceable> to bind to locally
+ to listen for peer connections (defaults to '')</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -279,6 +280,13 @@
<term><option>--port <replaceable>port</replaceable></option></term>
<listitem>
<para>the <replaceable>port</replaceable> to listen on (defaults to 9988)</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--apt_bind <replaceable>ip</replaceable>|<replaceable>hostname</replaceable>[,<replaceable>ip</replaceable>|<replaceable>hostname</replaceable> ...]</option></term>
+ <listitem>
+ <para>a comma-separated list of <replaceable>ips</replaceable> and <replaceable>hostnames</replaceable>
+ to bind to locally to listen for requests from Apt clients (defaults to '')</para>
</listitem>
</varlistentry>
<varlistentry>
Modified: debtorrent/trunk/debtorrent-client.conf
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debtorrent-client.conf?rev=299&op=diff
==============================================================================
--- debtorrent/trunk/debtorrent-client.conf (original)
+++ debtorrent/trunk/debtorrent-client.conf Wed Oct 17 03:48:40 2007
@@ -144,13 +144,14 @@
# upload_unit_size = 1460
###############################################################################
-# C O N N E C T I O N S
+# T O R R E N T C O N N E C T I O N S
###############################################################################
#
# 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.
+# A comma-separated list of IPs and hostnames to bind to listen on locally for
+# connections from peers. Leaving this blank will cause it to listen on all
+# IPs and hostnames.
#
# bind = ""
@@ -322,6 +323,16 @@
# apt_port = 9988
#
+# Apt Bind
+#
+# A comma-separated list of IPs and hostnames to bind to listen on locally for
+# connections from Apt clients. Leaving this blank will cause it to listen on
+# all IPs and hostnames.
+#
+
+# apt_bind = ""
+
+#
# Show InfoPage
#
# Whether to display an information and statistics page when the APT
More information about the Debtorrent-commits
mailing list