From 52a1d47b47a4f68ee189d0ae7e67dfb815d7258a Mon Sep 17 00:00:00 2001 From: Cameron Dale Date: Fri, 25 Apr 2008 18:24:50 -0700 Subject: [PATCH] Clean up the language in the description and man pages. Also tightened the dependency on Twisted to 8.0. --- debian/apt-p2p.conf.sgml | 22 +++++++-------- debian/apt-p2p.sgml | 59 ++++++++++++++++++++++++++++------------ debian/control | 6 ++-- 3 files changed, 55 insertions(+), 32 deletions(-) diff --git a/debian/apt-p2p.conf.sgml b/debian/apt-p2p.conf.sgml index 21b9d3d..98a8a8c 100644 --- a/debian/apt-p2p.conf.sgml +++ b/debian/apt-p2p.conf.sgml @@ -4,14 +4,14 @@ Cameron"> Dale"> - February 17, 2008"> + April 25, 2008"> 5"> camrdale@gmail.com"> apt-p2p.conf"> - + Debian"> GNU"> @@ -62,15 +62,15 @@ FORMAT &dhpackage; has a structure similar to Microsoft Windows INI files. - The configuration file consists of sections, led by a ``[section]'' header and followed - by ``name = value'' or ``name: value'' entries, with continuations in the style of RFC 822 + The configuration file consists of sections, led by a '[section]' header and followed + by 'name = value' or 'name: value' entries, with continuations in the style of RFC 822 (values can span multiple lines by starting the subsequent lines with one or more spaces). Some values indicate times, in which case a suffix of 'd' for days, 'h' for hours, 'm' for minutes, and 's' for seconds can be used. Boolean values can be '1', 'yes', 'true', and 'on' to evaluate to True, or '0', 'no', 'false', and 'off' to evaluate to false. Note that leading whitespace is removed from values, and case is not important. - Lines beginning with "#" or ";" are ignored and may be used to provide comments. + Lines beginning with '#' or ';' are ignored and may be used to provide comments. @@ -153,7 +153,7 @@ The time after which to refresh DHT keys. This should be a time slightly less than the DHT's KEY_EXPIRE value. - (Default is 57 minutes.) + (Default is 2.5 hours.) @@ -167,10 +167,10 @@ - The DHT implementation to use. It must be possile to do (in python) - ``from <DHT>.DHT import DHT'' to get a class that implements the IDHT interface. - There should also be a similarly named section below to specify the options for the DHT. - (Default is `apt_p2p_Khashmir') + The DHT implementation to use. It must be possile to do (in python) 'from + <DHT>.DHT import DHT' to get a class that implements the IDHT interface. + There should also be a similarly named section in the config file to specify + the options for the DHT. (Default is 'apt_p2p_Khashmir') @@ -267,7 +267,7 @@ The time to wait before expiring unrefreshed keys. - (Default is 1 hour.) + (Default is 3 hours.) diff --git a/debian/apt-p2p.sgml b/debian/apt-p2p.sgml index aa106a8..d8e9597 100644 --- a/debian/apt-p2p.sgml +++ b/debian/apt-p2p.sgml @@ -4,7 +4,7 @@ Cameron"> Dale"> - February 17, 2008"> + April 25, 2008"> 8"> @@ -47,14 +47,14 @@ Normally &dhpackage; is run from init.d using twistd, in which case no &dhpackage; options can be specified on the command-line, and all configuration variables are - read from the default config file locations of ${HOME}/.apt-p2p.conf and /etc/apt-p2p/apt-p2p.conf. + read from the default config file locations of ${HOME}/.apt-p2p/apt-p2p.conf and /etc/apt-p2p/apt-p2p.conf. The command is then: twistd -y /path/to/&dhpackage; - For a detailed listing of the twistd options, see + For a detailed listing of the twistd options, see twistd1 - &dhpackage; can also be run without twistd by executing: + &dhpackage; can also be run without twistd by executing: &dhpackage; @@ -63,31 +63,54 @@ DESCRIPTION - This manual page documents briefly the options available to the &dhpackage; command. &dhpackage; is a helper for downloading Debian packages files with APT. It will download any needed files from other Apt-P2P peers in a - bittorrent-like manner, and so reduce the strain on the Debian mirrors. + peer-to-peer manner, and so reduce the strain on the Debian mirrors. - In order for APT to send it's requests to &dhpackage;, the source.list entries must be modified to point to the + + APT SETUP + + In order for APT to send it's requests to &dhpackage;, the sources.list entries must be modified to point to the local &dhpackage; address. Unless you have changed the default port, then adding "localhost:9977/" to the beginning of each entry should be sufficient. For example, if your sources.list contains a line like this: - - deb http://ftp.us.debian.org/debian etch main contrib non-free - + +
deb http://ftp.us.debian.org/debian etch main contrib non-free
+ then replace it with this: - - deb http://localhost:9977/ftp.us.debian.org/debian etch main contrib non-free + +
deb http://localhost:9977/ftp.us.debian.org/debian etch main contrib non-free
+ + You can do the same with 'deb-src' lines as well, and &dhpackage; + will be used to download and share your source packages as well. + + + + PORT FORWARDING + + It is VERY important that Apt-P2P's ports be reachable by other peers. + This is needed both to share files with others, and to connect to + others through the DHT to find peers for files. If you aren't + accessible by others, you will not only not share anything, but your + performance during downloading will be affected. + + Apt-P2P uses a default port of 9977, over both TCP and UDP, for it's + communication. You can change this port in the + /etc/apt-p2p/apt-p2p.conf file, and use different ports for TCP and + UDP, if desired. Whatever port you use, make sure to forward it + through your NAT or firewall to improve your performance and share + with others. Information on port forwarding can be found here: + + - The port can be changed in the &dhpackage; config file in /etc/&dhpackage;/&dhpackage;.conf, - but it defaults to 9977. - + + OPTIONS These programs follow the usual &gnu; command line syntax, - with short options starting with a single dash (`-'), - and long options starting with two dashes (`--'). + with short options starting with a single dash ('-'), + and long options starting with two dashes ('--'). A summary of options is included below. @@ -103,7 +126,7 @@ the filename to print log messages to, - or `-' to log to standard output, if not specified then + or '-' to log to standard output, if not specified then /var/log/apt-p2p.log will be used diff --git a/debian/control b/debian/control index c16ad75..6473a61 100644 --- a/debian/control +++ b/debian/control @@ -12,12 +12,12 @@ XS-Dm-Upload-Allowed: yes Package: apt-p2p Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python-twisted-web2 (>= 0.2), adduser, python-debian (>= 0.1.4), python-apt (>= 0.6.20), python-pysqlite2 (>= 2.1) +Depends: ${python:Depends}, ${misc:Depends}, python-twisted-web2 (>= 8.0), adduser, python-debian (>= 0.1.4), python-apt (>= 0.6.20), python-pysqlite2 (>= 2.1) Provides: python-apt-p2p, python-apt-p2p-khashmir Description: apt helper for peer-to-peer downloads of Debian packages Apt-P2P is a helper for downloading Debian packages files with APT. It will download any needed files from other Apt-P2P peers in a - bittorrent-like manner, and so reduce the strain on the Debian mirrors. + peer-to-peer manner, and so reduce the strain on the Debian mirrors. . The Apt-P2P daemon runs automatically on startup and listens for requests from APT for files, as well as maintaining membership in a @@ -25,7 +25,7 @@ Description: apt helper for peer-to-peer downloads of Debian packages available (most files), peers that have the file are looked for in the DHT. The file can then be downloaded from them, using the uploading bandwidth of other peers while reducing the demand on the Debian mirror - network. However, if a package cannot be found on any peers, Apt-P2P + network. However, if a package can not be found on any peers, Apt-P2P will fall back to downloading from a mirror to ensure all packages are downloaded. Once downloaded, the file is hash checked and added to the DHT so that other peers can download it without the mirror. -- 2.39.2