moved the details about push mirroring into the push_mirroring web page and organized it properly

CVS version numbers

english/mirror/ftpmirror.wml: 1.14 -> 1.15 
english/mirror/push_mirroring.wml: 1.1 -> 1.2 
english/mirror/push_server.wml: 1.4 -> 1.5 
english/mirror/webmirror.wml: 1.18 -> 1.19

1 files changed, 72 insertions, 1 deletions

diff --git a/english/mirror/push_mirroring.wml b/english/mirror/push_mirroring.wml
index d66f271fee6..803d02f1002 100644
--- a/english/mirror/push_mirroring.wml
+++ b/english/mirror/push_mirroring.wml
@@ -1,4 +1,17 @@
-#use wml::debian::template title="Explanation of Push Mirroring"
+#use wml::debian::template title="Push Mirroring"
+
+<p>Push mirroring is a form of mirroring using rsync that minimizes the time
+it takes for changes to the main archive to reach mirrors. The server mirror
+uses a triggering mechanism to inform the client mirror it needs to be
+updated.
+
+<p>Push mirroring takes a little more effort to set up since the maintainers
+of the upstream and downstream mirror must exchange information. The benefit
+is that the upstream mirror initiates the mirror process immediately after
+its archive has been updated. This allows changes to the archive to
+propagate extremely quickly.
+
+<h2>Explanation of the method</h2>
 
 <p>First some background on ssh. Ssh allows people to connect to accounts
 on different machines in a secure way. Not only are passwords never passed
@@ -29,3 +42,61 @@ As it is set up, the username and password are passed in the clear. This
 shouldn't be a problem though, as the worst that can happen is that a
 third party gains the ability to mirror the Debian pages from that site.
 
+<h2>Setting up a push client mirror</h2>
+
+<p>It is best to set this up using the account of an ordinary user, not
+root. The contents of the public ssh key given to you by the upstream mirror
+should be placed in <kbd>~&lt;user&gt;/.ssh/authorized_keys</kbd>.
+
+<p>To become a push client for the FTP archive, you will the files
+<a href="ftpsync">ftpsync</a> and <a href="ftpsync.conf">ftpsync.conf</a>
+will be needed. Edit ftpsync.conf and follow the directions in there using
+the information provided to you by the upstream mirror.
+
+<p>To become a push client for the non-US FTP archive, you will need the
+files <a href="ftpsync-non-US">ftpsync-non-US</a> and
+<a href="ftpsync-non-US.conf">ftpsync-non-US.conf</a>.
+The files have different names so that you may use the same account to
+mirror both archives.
+
+<p>To become a push client for the WWW pages, you will need the files
+<a href="websync">websync</a> and <a href="websync.conf">websync.conf</a>.
+Edit websync.conf and follow the directions in there using the information
+provided to you by the upstream mirror.
+
+<h2>Push-Primary client sites</h2>
+
+<p>Push-Primary client mirrors, also referred to as Tier-1 mirrors, are the
+push client mirrors which are allowed to mirror from our master archives.
+
+<p>If your site is becoming a Push-Primary for the FTP archive, you will
+need the <a href="identity.pub.master.ftp">public ssh key for
+archvsync@ftp-master.debian.org</a>.
+
+<p>If your site is becoming a Push-Primary for the non-US FTP archive, you
+will need the <a href="identity.pub.non-US.ftp">public ssh key for
+archvsync@non-us.debian.org</a>.
+
+<p>If your site is becoming a Push-Primary for the WWW pages, you will need
+the <a href="identity.pub.master.web">public ssh key for
+archvsync@www-master.debian.org</a>.
+
+<h2>Setting up a push server mirror</h2>
+
+<p>Given the large number of mirrors and the size of the Debian archive, it
+is not feasible for all the mirrors to use the master archive site as the
+upstream source for Debian (i.e. their push server mirror). It is much more
+efficient if the load is distributed among a number of push mirrors
+distributed throughout the globe.
+
+<p>Please note that we will approach sites to become push servers. If your
+site is <strong>very</strong> well connected (both very good bandwidth and
+well connected to major backbones) and you are willing to let other sites
+mirror from your site, you may want to let us know so we can consider you
+for a push mirror.
+
+<p>Additionally, push server mirrors should contain a mirror of the entire
+Debian archive, and themselves be push client mirrors of the master archive
+(or another push server).
+
+<p>See the <a href="push_server">details on setting up a push server</a>.