public inbox for gentoo-doc-cvs@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2006-05-12 11:21 undefined
  0 siblings, 0 replies; 16+ messages in thread
From: undefined @ 2006-05-12 11:21 UTC (permalink / raw
  To: gentoo-doc-cvs

jforman     06/05/12 11:21:11

  Modified:             rsync.xml
  Log:
  Rewrite complements of admin tobias klausmann

Revision  Changes    Path
1.47                 xml/htdocs/doc/en/rsync.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.47&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.47&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml.diff?r1=1.46&r2=1.47&cvsroot=gentoo

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- rsync.xml	1 Jan 2006 11:51:43 -0000	1.46
+++ rsync.xml	12 May 2006 11:21:10 -0000	1.47
@@ -1,47 +1,61 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.46 2006/01/01 11:51:43 neysx Exp $ -->
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.47 2006/05/12 11:21:10 jforman Exp $ -->
 
-<guide link="/doc/en/rsync.xml">
-<title>Gentoo Linux rsync Mirrors Policy</title>
-<author title="Author">
+<guide link="/doc/en/rsync.xml" lang="en">
+<title>Gentoo Linux rsync Mirrors Policy and Guide</title>
+
+<author title="Author, new version">
+  Tobias Klausmann
+</author>
+
+<author title="Original Author">
   <mail link="mirror-admin@gentoo.org">Gentoo Mirror Administrators</mail>
 </author>
-<author title="Editor">
+<author title="Original Editor">
   <mail link="neysx@gentoo.org">Xavier Neys</mail>
 </author>
+<author title="Contributor">
+  <mail link="klausman@schwarzvogel.de">Tobias Klausmann</mail>
+</author>
+
+
 
 <abstract>
 This document explains how to set up a official rsync mirror and your own local
 mirror.
 </abstract>
 
+<!-- The content of this document is licensed under the CC-BY-SA license -->
+<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.13</version>
-<date>2005-12-12</date>
+<version>3.0</version>
+<date>2006-05-12</date>
 
 <chapter>
-<title>Hardware Request</title>
+<title>Preliminaries</title>
 <section>
-<title>Machine Donation</title>
+<title>Terms, names and all that</title>
 <body>
 
 <p>
-Gentoo Linux relies upon two different kinds of mirrors:  main rotation mirrors
-and community mirrors.  Main rotation mirrors are dedicated rsync servers and
-are responsible for handling the bulk of our rsync traffic.  All main rotation
-mirrors run Gentoo Linux and are managed by members of the Gentoo development
-team.  Community mirrors are servers which are provided and managed by members
-of the community.  These servers may or may not be dedicated to rsync usage and
-they may or may not run Gentoo Linux.
+This guide is intended for people who would like to set up an rsync mirror of
+their own. I caters not only to those who want to run an official rsync mirror
+but also those wanting to run private mirrors.
 </p>
 
-<p>
-At this time, we have enough community mirrors and are actively seeking
-additional main rotation mirrors.  Specifications for main rotation servers
-include:
-</p>
+<p>There are three kinds of Gentoo rsync mirrors: main rotation mirrors,
+community mirrors and private mirrors. Main rotation mirrors are maintained by
+the Gentoo infrastructure team. They handle the bulk of the Gentoo rsync
+traffic. The community mirrors are run by volunteers from the Gentoo community.
+Private mirrors are mirrors run by individuals which are closed off to the
+public and meant to cut traffic costs and latency for an organization or
+individual.</p>
+
+<p>At this time, we have enough community mirrors and are actively seeking
+additional main rotation mirrors. Specifications for main rotation servers
+include:</p>
 
 <ul>
   <li>Minimum of a 2GHz Pentium 4 processor (or equivalent)</li>
@@ -65,295 +79,152 @@
 </body>
 </section>
 </chapter>
-<!--
-<chapter>
-<title>Requirements</title>
-<section>
-<title>Minimum Bandwidth</title>
-<body>
-
-<p>
-To properly host a mirror you should have a minimum of 5Mbps full duplex
-bandwidth.
-</p>
-
-</body>
-</section>
-<section>
-<title>Minimum User Count</title>
-<body>
-
-<p>
-We ask that you support a minimum of 15 concurrent user connections.
-</p>
-
-</body>
-</section>
-<section>
-<title>Minimum Hardware</title>
-<body>
-
-<p>
-In order to effectively serve at least 15 concurrent user connections, we ask
-that you have at least the following minimum hardware requirements:
-</p>
-
-<ul>
-  <li>PIII 500 Processor</li>
-  <li>256MB RAM</li>
-</ul>
-
-</body>
-</section>
-<section>
-<title>Update Frequency</title>
-<body>
-
-<p>
-Updates must occur at :00 and :30 of each hour, 24 hours a day. It is
-<e>very</e> important that this schedule is followed strictly, as we use a
-round robin style DNS to select the users' rsync server.
-</p>
-
-</body>
-</section>
-<section>
-<title>MOTD (/etc/rsync/rsyncd.motd)</title>
-<body>
-
-<p>
-Please include the following information in your rsync MOTD file:
-</p>
-
-<ul>
-<li>server name</li>
-<li>server IP address</li>
-<li>server specs (CPU and RAM)</li>
-<li>bandwidth available to the server</li>
-<li>user connection limit, if any</li>
-<li>server location (city and country)</li>
-<li>a contact name and email address</li>
-</ul>
-
-<p>
-Including the above information in your MOTD file makes it easy to identify
-your mirror in case of problems.
-</p>
-
-</body>
-</section>
-</chapter>
 
 <chapter>
-<title>Implementation details</title>
-<section>
-<body>
-
-<p>
-To set up a new mirror, please complete the following steps:
-</p>
-
-<ul>
-<li>
-  Set up your mirror to synchronize against an existing, public Gentoo Linux
-  rsync mirror.  It does not matter which one.  Please make sure to synchronize
-  in accordance with our <e>Update Frequency</e> schedule noted above.
-</li>
-<li>
-  Fill out a bug report on <uri link="http://bugs.gentoo.org">bugs.gentoo.org</uri>
-  that contains your organization name, server name, ip address, contact information and the fact
-  that you'd like to become a new rsync mirror.  We will check your server to
-  ensure it is synchronizing properly. It is important that your server synchronizes
-  twice an hour, with one sync occuring between :00 and :10 and the second sync
-  occuring between :30 and :40.  You may pick any time in these two, 10-minute 
-  windows to schedule your sync. 
-</li>
-<li>
-  Once we have verified that the mirror is synchronizing correctly, we will add
-  the server's IP address to the rsync1.us.gentoo.org access list.
-</li>
-<li>
-  Update your rsync cron job to point to <path>rsync1.us.gentoo.org</path>. We
-  will monitor your server over the next 48-72 hours to ensure it is
-  synchronizing correctly.
-</li>
-</ul>
-
-<p>
-If all steps went smoothly, we will then set up an official 
-<path>rsync[num].[countrycode].gentoo.org</path> DNS entry and add you to our
-DNS round-robin for rsync.[continentcode].gentoo.org and rsync.[countrycode].gentoo.org.
-Shortly after you've been added to our DNS, you should start to see rsync
-traffic.
-</p>
-
-<p>
-Additionally, you, the mirror admin will be added to the gentoo-mirrors mailing
-list (low traffic) so that you can folllow all issues associated with rsync
-mirrors.
-</p>
-
-<note>
-Thanks for helping out Gentoo Linux users and developers! :) For any rsync
-administration issues or problems, please visit <uri
-link="http://bugs.gentoo.org">http://bugs.gentoo.org</uri> and fill out a bug
-on the product "Rsync".
-</note>
-
-</body>
-</section>
-</chapter>
-
-<chapter>
-<title>Parallel Tasks</title>
+<title>Setting up your own local rsync mirror</title>
 <section>
+<title>Introduction</title>
 <body>
 
-<p>
-We will have soon a rrdtool created page that will simply have links to graphs
-(ordered by continent, then country, then server) of official rsync mirrors
-availability (these graphs will be made from sping output). We will check these
-graphs at least once a day, and unreacheable boxes will be removed from the
-RR DNS scheme until the problems are addressed. We will have scripts checking
-that every 30 minutes all mirrors are, in fact, syncing with us.
+<p>Many users run Gentoo on several machines and need to sync the portage trees
+on all of them. Using public mirrors is simply a waste of bandwidth at both
+ends. Syncing only one machine against a public mirror and all others against
+that computer would save resources on Gentoo mirrors and save users' bandwidth.
 </p>
 
-<warn>
-If a mirror has periodically problematic behavior and the admin is being
-contacted and the situation doesn't improve, then that mirror box will be
-taken of the RR scheme permanently.
-</warn>
-
-</body>
-</section>
-</chapter>
--->
-<chapter>
-<title>Short FAQ (provided as a reference for current mirror admins)</title>
-<section>
-<title>Q: Who should I contact regarding rsync issues and maintenance?</title>
-<body>
+<p>The same holds true for organizations who would like to control the rsync
+mirror their servers and workstations sync against. Of course, they usually also
+want to save on badnwidth and traffic costs. </p>
+
+<p>All you need to do is select which machine is going to be your own local
+rsync mirror and set it up. You should choose a computer that can handle the CPU
+and disk load that an rsync operation require. Your local mirror also needs to
+be available whenever any of your other computers syncs its portage tree.
+Besides, it should have a static IP address or a name that always resolves to
+your server.  Configuring a DHCP and/or a DNS server is beyond the scope of this
+guide.</p>
 
-<p>
-A: Visit http://bugs.gentoo.org and fill out a bug on the product "Rsync".
-</p>
+<p>Note that these instructions assume your private rsync mirror is a Gentoo
+machine. If you intend to run it on a different distribution, the guide for
+setting up a community mirror might be more helpful. Just don't sync the mirror
+every half hour but once or twice a day.</p>
 
 </body>
 </section>
 <section>
-<title>Q: I run a private rsync mirror for my company. Can I still access rsync1.us.gentoo.org?</title>
+<title>Setting up the server</title>
 <body>
 
-<p>
-A: Because our resources are limited, we need to ensure we allocate them in
-such a way as to provide the maximum amount of benefit to our users. As such, we
-limit connections to our master rsync and distfile mirrors to public mirrors
-only. Users are welcome to use our regular mirror system to establish a private
-rsync mirror, though they are asked to follow certain basic
-<uri link="http://www.gentoo.org/news/en/gwn/20030505-newsletter.xml#doc_chap1_sect3">
-rsync etiquette guidelines</uri>.
-</p>
+<p>There is no extra package to install as the required software is already on
+your computer.Setting up your own local rsync mirror is just a matter of
+configuring the <e>rsyncd</e> daemon to make your <path>/usr/portage</path>
+directory available for syncing. Create the following
+<path>/etc/rsyncd.conf</path> configuration file: </p>
 
-</body>
-</section>
-<section>
-<title>Q: Is it important that I sync my mirror twice an hour?</title>
-<body>
+<pre caption="Sample /etc/rsyncd.conf">
+pid file = /var/run/rsyncd.pid
+max connections = 5
+use chroot = yes
+uid = nobody
+gid = nobody
+<comment># Optional: restrict access to your Gentoo boxes</comment>
+hosts allow = 192.168.0.1 192.168.0.2 192.168.1.0/24
+hosts deny  = *
 
-<p>
-A: Yes it is important.  You do not need to perform the syncs at exactly :00 and :30
-but the syncs should take place in each of the following two windows:
-</p>
+[gentoo-portage]
+path=/usr/portage
+comment=Gentoo Portage
+exclude=distfiles/ packages/
+</pre>
 
-<ol>
-  <li>:00 to :10</li>
-  <li>:30 to :40</li>
-</ol>
+<p> You do not need to use the <c>hosts allow</c> and <c>hosts deny</c> options.
+By default, all clients will be allowed to connect. The order in which you write
+the options is not relevant. The server will always check the <c>hosts allow</c>
+option first and grant the connection if the connecting host matches any of the
+listed patterns. The server will then check the <c>hosts deny</c> option and
+refuse the connection if any match is found. Any host that does not match
+anything will be granted a connection. Please read the man page (<c>man
+rsyncd.conf</c>) for more information. </p>
 
-<p>
-Additionally, please make sure that your syncs are exactly 30 minutes apart.  So, if
-you schedule the first sync of each hour for :08, please schedule the second sync of
-the hour for :38.
+<p> Now, start your rsync daemon with the following command as the root user:
 </p>
 
-</body>
-</section>
-
-<section>
-<title>Q: Where should I sync my rsync mirror before I become an official Gentoo mirror?</title>
-<body>
+<pre caption="Starting the rsync daemon">
+<comment>(Start the daemon now)</comment>
+# <i>/etc/init.d/rsyncd start</i>
+<comment>(Add the daemon to your default runlevel)</comment>
+# <i>rc-update add rsyncd default</i>
+</pre>
 
-<ul>
-  <li>I am a European-based rsync mirror: sync to rsync.de.gentoo.org</li>
-  <li>I am a US-based rsync mirror: sync to rsync.us.gentoo.org</li>
-  <li>I am not in the first two groups: sync to rsync.us.gentoo.org</li>
-</ul>
+<p> Let's test your rsync mirror. You do not need to try from another machine
+but it would be a good idea to do so. If your server is not known by name from
+all your computers, you can use its IP address instead. </p>
 
-</body>
-</section>
-<section>
-<title>Q: How do I find the mirror nearest to me?</title>
-<body>
+<pre caption="Testing your mirror">
+<comment>(You may use the server name or its IP)</comment>
+# <i>rsync 192.168.0.1::</i>
+gentoo-portage     Gentoo Portage
+# <i>rsync your_server_name::gentoo-portage</i>
+<comment>(You should see the content of /usr/portage on your mirror)</comment>
+</pre>
 
-<p>
-A: <c>netselect</c> was designed to do this for you. If you haven't already run
-<c>emerge netselect</c> then do it. Then run: <c>netselect rsync.gentoo.org</c>.
-After a minute or so netselect will print an IP address. Take this address and
-use it as the only parameter for rsync with two colons appended to it. eg:
-<c>rsync 1.2.3.4::</c>. You should be able to find out which mirror that is
-from the banner message. Update your <path>/etc/make.conf</path> accordingly.
-</p>
+<p> Your rsync mirror is now set up. Keep running <c>emerge --sync</c> as you
+have done so far to keep your server up-to-date. If you use cron or similar
+facilities to sync regularly, remember to keep it down to a sensible frequency
+like once or twice a day.</p>
+
+<note> Please note that most public mirror administrators consider syncing more
+than once or twice a day an abuse. Some if not most of them will ban your IP
+from their server if you start abusing their machines.</note>
 
 </body>
 </section>
 <section>
-<title>Q: Can I use compression when syncing against rsync1.us.gentoo.org?</title>
+<title>Configuring your clients</title>
 <body>
 
-<p>
-A: No.  Compression utilizes too many resources on the server, so we have
-forcibly disabled it on <path>rsync1.us.gentoo.org</path>. Please <e>do not</e>
-attempt to use compression when syncing against this server.
-</p>
+<p> Now, make your other computers use your own local rsync mirror instead of a
+public one. Edit your <path>/etc/make.conf</path> and make the <c>SYNC</c>
+variable point to your server. </p>
 
-</body>
-</section>
-<section>
-<title>Q: I'm seeing a lot of old and probably dead rsync processes, how can I get rid of them?</title>
-<body>
+<pre caption="Define SYNC in /etc/make.conf">
+<comment>(Use your server IP addess)</comment>
+SYNC="rsync://<i>192.168.0.1</i>/gentoo-portage"
+<comment>(Or use your server name)</comment>
+SYNC="rsync://<i>your_server_name</i>/gentoo-portage"
+</pre>
 
-<p>
-A: Please see the Example Scripts section.
-</p>
+<p> You can check that your computer has been properly set up by syncing against
+your own local mirror for the first time: </p>
 
-</body>
-</section>
-<section>
-<title>Q: There are many users who connect to my rsync server very frequently,
-sometimes even causing a DoS to my mirror, is there any way to prevent this?</title>
-<body>
+<pre caption="Checking and syncing">
+<comment>(Check that the SYNC variable has been setup)</comment>
+# <i>emerge --info|grep SYNC</i>
+SYNC="rsync://your_server_name/gentoo-portage"
+<comment>(Sync against your local mirror)</comment>
+# <i>emerge --sync</i>
+</pre>
 
-<p>
-A: Again please see the Example Scripts section.
-</p>
+<p> That's it! All your computers will now use your local rsync mirror whenever
+you run <c>emerge --sync</c>. </p>
 
 </body>
 </section>
 </chapter>
 
+
 <chapter>
-<title>Example Scripts</title>
+<title>Setting up a community rsync server</title>
 <section>
+<title>Introduction</title>
 <body>
 
-<note>
-You will find sample configuration and script files in the gentoo-rsync-mirror
-package. Just do <c>emerge gentoo-rsync-mirror</c>
-</note>
+<note> You can find sample configuration and script files in the
+gentoo-rsync-mirror package. Just do <c>emerge gentoo-rsync-mirror</c> </note>
 
 <p>
-Right now, mirroring our Portage tree requires around 250Mb, so it isn't space
-intensive; having at least 500Mb free should allow for growing room. Setting
+Right now, mirroring our Portage tree requires around 600Mb, so it isn't space
+intensive; having at least 1Gb free should allow for growing room. Setting
 up a Portage tree mirror is simple -- first, ensure that your mirror has rsync
 installed. Then, set up your <path>rsyncd.conf</path> file to look something like this:
 </p>
@@ -383,21 +254,24 @@
 exclude = distfiles
 </pre>
 
-<p>
-Above, the gentoo-x86-portage mirror points to the same data as gentoo-portage.
-Although we have recently changed the official name of our mirror to
-gentoo-portage, gentoo-x86-portage is still needed for backwards compatibility,
-so include both entries.
-</p>
-
-<p>
-For security reasons, the use of a chrooted environment is required!
-</p>
-
-<p>
-Now, you need to mirror the Gentoo Linux Portage tree. You should use the
-following script to do so:
-</p>
+<p>You can pick your own locations for most of the files, of course. What's
+important are the section names (<c>[gentoo-portage]</c> and
+<c>[gentoo-x86-portage]</c>). They are the locations that rsync clients will try
+to sync from</p>
+
+<p>Above, the gentoo-x86-portage mirror points to the same data as
+gentoo-portage. Although we have recently changed the official name of our
+mirror to gentoo-portage, gentoo-x86-portage is still needed for backwards
+compatibility, so include both entries. Eventually, the gentoo-x86-portage
+location will be removed.</p>
+
+<p> For security reasons, the use of a chrooted environment is required! This
+has implications for the logged timestamps -- see the FAQ below.</p>
+
+<p> Now, you need to mirror the Gentoo Linux Portage tree. You can use the
+script below to do so. Again, you'll probably want to change some of the file
+locations to suit your needs -- in particular, they should match those of your
+<path>rsyncd.conf</path>.</p>
 
 <pre caption="rsync-gentoo-portage.sh">
 #!/bin/bash
@@ -417,217 +291,168 @@
 echo "End: "`date` >> $0.log 2>&amp;1 
 </pre>
 
-<pre caption="/etc/init.d/rsyncd">
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# &#36;Header: /var/cvsroot/gentoo-x86/net-misc/rsync/files/rsyncd.init.d,v 1.2 2004/05/02 22:45:02 mholzer Exp &#36;
-
-depend() {
-need net
-}
-
-# FYI: --sparce seems to cause problems.
-RSYNCOPTS="--daemon --safe-links --timeout=300"
-
-start() {
-ebegin "Starting rsync daemon"
-start-stop-daemon --start --quiet --pidfile /var/run/rsyncd.pid --nicelevel 15 --exec /usr/bin/rsync -- ${RSYNCOPTS}
-eend $?
-}
-
-stop() {
-ebegin "Stopping rsync daemon"
-start-stop-daemon --stop --quiet --pidfile /var/run/rsyncd.pid
-eend $?
-} 
-</pre>
+<p> Your <path>rsyncd.motd</path> should contain your IP address and other
+relevant information about your mirror, such as information about the host
+providing the Portage mirror and an administrative contact.You can now test your
+server as outlined in the "Setting up your own local rsync mirror" section
+above.</p>
+
+<p> After you have been approved as an official rsync mirror your host will be
+aliased with a name of the form: <path>rsync[num].[country
+code].gentoo.org</path> </p> 
 
-<p>
-Your <path>rsyncd.motd</path> should contain your IP address and other relevant information
-about your mirror, such as information about the host providing the Portage
-mirror and an administrative contact. After you have been approved as an
-official rsync mirror your host will be aliased with a name of the form:
-<path>rsync[num].[country code].gentoo.org</path>
-</p>
+</body>
+</section>
+</chapter>
 
-<p>
-This command will help you to kill old rsync processes that sometimes lie
-around due to connection problems.  It's important to kill those because they
-count as valid connections for the 'max connections' option.  You may run this
-command via crontab every hour, it will search and kill rsync processes older
-than one hour.
-</p>
+<chapter>
+<title>Short FAQ</title>
+<section>
+<title>Q: Who should I contact regarding rsync issues and maintenance?</title>
+<body>
 
-<pre caption="Kill old rsync processes">
-/bin/kill -9 `/bin/ps --no-headers -Crsync -o etime,user,pid,command|/bin/grep nobody | \
-             /bin/grep "[0-9]\{2\}:[0-9]\{2\}:" |/bin/awk '{print $3}'` 
-</pre>
+<p> A: Visit <uri link="http://bugs.gentoo.org">Gentoo Bugzilla</uri> and fill
+out a bug on the product "Mirrors", component "Server Problem". </p>
 
-<p>
-In some cases, there are a few inconsiderate users who abuse the rsync mirror
-system by syncing more than 1-2 times per day.  In the most extreme cases,
-users schedule cron jobs to sync every 15 minutes or so.  This often leads to a
-Denial of Service attack by continually occupying an rsync slot that could have
-otherwise gone to another user.  To try and prevent this, you may use the
-following <uri link="/proj/en/infrastructure/mirrors/rsyncd.conf_pl.txt">perl
-script</uri> which will scan through your rsync log files, pick out IP
-addresses that have already connected more than <c>N</c> times that day and
-dynamically create a <path>rsyncd.conf</path> file, including the offending IP addresses in
-the 'hosts deny' directive.  The following line controls what <c>N</c> equals:
-</p>
+</body>
+</section>
 
-<pre caption="Define maximum number of connections per IP">
-@badhosts=grep {$hash{$_}>4} keys %hash;
-</pre>
+<section>
+<title>Q: How can I check the freshness of an official rsync server?</title>
+<body> 
+<p>The Gentoo infrastructure team monitors all community rsync servers for
+freshness. You can see the results on the <uri link="http://mirrorstats.gentoo.org/rsync">corresponding web page</uri>. 
+</p></body>
+</section>
 
-<p>
-If you use this script, please remember to rotate your rsync log files daily
-and modify the script to match the location of your <path>rsyncd.conf</path>
-file. This script is tested on Gentoo Linux, but should work suitably on other
-arches that support both rsync and perl.  
-</p>
+<section>
+<title>Q: I run a private rsync mirror for my company. Can I still access
+rsync1.us.gentoo.org?</title> 
+
+<body>
+
+<p> A: Because our resources are limited, we need to ensure we allocate them in
+such a way as to provide the maximum amount of benefit to our users. As such, we
+limit connections to our master rsync and distfile mirrors to public mirrors
+only. Users are welcome to use our regular mirror system to establish a private
+rsync mirror, though they are asked to follow certain basic <uri
+link="http://www.gentoo.org/news/en/gwn/20030505-newsletter.xml#doc_chap1_sect3">
+rsync etiquette guidelines</uri>. </p>
 
 </body>
 </section>
-</chapter>
-
-<chapter>
-<title>Setting up your own local rsync mirror</title>
 <section>
-<title>Introduction</title>
+<title>Q: Is it important that I sync my mirror twice an hour?</title>
 <body>
 
-<p>
-Many users run Gentoo on several machines and need to run <c>emerge --sync</c>
-on all of them. Using public mirrors is simply a waste of bandwidth at both
-ends. Syncing only one machine against a public mirror and all others against
-that computer would save resources on Gentoo mirrors and save users' bandwidth.
+<p> A: Yes it is important.  You do not need to perform the syncs at exactly :00
+and :30 but the syncs should take place in each of the following two windows:
 </p>
 
-<p>
-All you need to do is select which of your machines is going to be your own local
-rsync mirror and set it up. You should choose a computer that can handle the
-CPU and disk load that an rsync operation require. Your local mirror also needs
-to be available whenever any of your other computers syncs its portage tree.
-Besides, it should have a static IP address or a name that always resolves to
-your server.  Configuring a DHCP and/or a DNS server is beyond the scope of
-this guide.
+<ol>
+  <li>:00 to :10</li>
+  <li>:30 to :40</li>
+</ol>
+
+<p> Additionally, please make sure that your syncs are exactly 30 minutes apart.
+So, if you schedule the first sync of each hour for :08, please schedule the
+second sync of the hour for :38.
 </p>
 
 </body>
 </section>
+
 <section>
-<title>Setting up the server</title>
+<title>Q: Where should I sync my rsync mirror before I become an official Gentoo mirror?</title>
 <body>
 
-<p>
-There is no extra package to install as the required software is already on
-your computer.  Setting up your own local rsync mirror is just a matter of
-configuring the <e>rsyncd</e> daemon to make your <path>/usr/portage</path>
-directory available for syncing. Create the following
-<path>/etc/rsyncd.conf</path> configuration file: </p>
-
-<pre caption="Sample /etc/rsyncd.conf">
-pid file = /var/run/rsyncd.pid
-max connections = 5
-use chroot = yes
-uid = nobody
-gid = nobody
-<comment># Optional: restrict access to your Gentoo boxes</comment>
-hosts allow = 192.168.0.1 192.168.0.2 192.168.1.0/24
-hosts deny  = *
-
-[gentoo-portage]
-path=/usr/portage
-comment=Gentoo Portage
-exclude=distfiles/ packages/
-</pre>
-
-<p>
-You do not have to use the <c>hosts allow</c> and <c>hosts deny</c> options. By
-default, all clients will be allowed to connect. The order in which you write
-the options is not relevant. The server will always check the <c>hosts
-allow</c> option first and grant the connection if the connecting host matches
-any of the listed patterns. The server will then check the <c>hosts deny</c>
-option and refuse the connection if any match is found. Any host that does not
-match anything will be granted a connection. Please read the man page (<c>man
-rsyncd.conf</c>) for more information.
-</p>
+<ul>
+  <li>For European-based rsync mirror: sync to rsync.de.gentoo.org</li>
+  <li>For US-based rsync mirror: sync to rsync.us.gentoo.org</li>
+  <li>For all others: sync to rsync.us.gentoo.org</li>
+</ul>
 
-<p>
-Now, start your rsync daemon with the following command as the root user:
-</p>
+</body>
+</section>
 
-<pre caption="Starting the rsync daemon">
-<comment>(Start the daemon now)</comment>
-# <i>/etc/init.d/rsyncd start</i>
-<comment>(Add the daemon to your default runlevel)</comment>
-# <i>rc-update add rsyncd default</i>
-</pre>
+<section>
+<title>Q: How do I find the mirror nearest to me?</title>
+<body>
 
-<p>
-Let's test your rsync mirror. You do not need to try from another machine but
-it would be a good idea to do so. If your server is not known by name from all
-your computers, you can use its IP address instead.
-</p>
+<p> A: <c>netselect</c> was designed to do this for you. If you haven't already
+run <c>emerge netselect</c> then do it. Then run: <c>netselect
+rsync.gentoo.org</c>. After a minute or so netselect will print an IP address.
+Take this address and use it as the only parameter for rsync with two colons
+appended to it. eg: <c>rsync 1.2.3.4::</c>. You should be able to find out which
+mirror that is from the banner message. Update your <path>/etc/make.conf</path>
+accordingly. </p>
 
-<pre caption="Testing your mirror">
-<comment>(You may use the server name or its IP)</comment>
-# <i>rsync 192.168.0.1::</i>
-gentoo-portage     Gentoo Portage
-# <i>rsync your_server_name::gentoo-portage</i>
-<comment>(You should see the content of /usr/portage on your mirror)</comment>
-</pre>
+</body>
+</section>
 
-<p>
-Your rsync mirror is now set up. Keep running <c>emerge --sync</c> as you have
-done so far to keep your server up-to-date.
-</p>
+<section>
+<title>Q: Can I use compression when syncing against rsync1.us.gentoo.org?</title>
+<body>
 
-<note>
-Please note that most public mirror administrators consider syncing more than
-once or twice a day an abuse.
-</note>
+<p> A: No. Compression utilizes too many resources on the server, so we have
+forcibly disabled it on <path>rsync1.us.gentoo.org</path>. Please <e>do not</e>
+attempt to use compression when syncing against this server. </p>
 
 </body>
 </section>
+
 <section>
-<title>Configuring your clients</title>
+<title>Q: I'm seeing a lot of old and probably dead rsync processes, how can I
+get rid of them?</title>
 <body>
 
 <p>
-Now, make your other computers use your own local rsync mirror instead of a
-public one. Edit your <path>/etc/make.conf</path> and make the <c>SYNC</c>
-variable point to your server.
+This command will help you to kill old rsync processes that sometimes lie
+around due to connection problems.  It's important to kill those because they
+count as valid connections for the 'max connections' option.  You may run this
+command via crontab every hour, it will search and kill rsync processes older
+than one hour.
 </p>
 
-<pre caption="Define SYNC in /etc/make.conf">
-<comment>(Use your server IP addess)</comment>
-SYNC="rsync://<i>192.168.0.1</i>/gentoo-portage"
-<comment>(Or use your server name)</comment>
-SYNC="rsync://<i>your_server_name</i>/gentoo-portage"
+<pre caption="Kill old rsync processes">
+/bin/kill -9 `/bin/ps --no-headers -Crsync -o etime,user,pid,command|/bin/grep nobody | \
+             /bin/grep "[0-9]\{2\}:[0-9]\{2\}:" |/bin/awk '{print $3}'` 
 </pre>
 
+</body>
+</section>
+<section>
+<title>Q: There are many users who connect to my rsync server very frequently,
+sometimes even causing a DoS to my mirror, is there any way to prevent
+this?</title>
+<body>
+
 <p>
-You can check that your computer has been properly set up by syncing against your
-own local mirror for the first time:
-</p>
+In some cases, there are a few inconsiderate users who abuse the rsync mirror
+system by syncing more than 1-2 times per day.  In the most extreme cases, users
+schedule cron jobs to sync every 15 minutes or so.  This often leads to a Denial
+of Service attack by continually occupying an rsync slot that could have
+otherwise gone to another user.  To try and prevent this, you may use the <uri
+link="/proj/en/infrastructure/mirrors/rsyncd.conf_pl.txt">this perl script</uri>
+which will scan through your rsync log files, pick out IP addresses that have
+already connected more than <c>N</c> times that day and dynamically create a
+<path>rsyncd.conf</path> file, including the offending IP addresses in the
+'hosts deny' directive.  The following line controls what <c>N</c> equals (in
+this case 4): </p>
 
-<pre caption="Checking and syncing">
-<comment>(Check that the SYNC variable has been setup)</comment>
-# <i>emerge --info|grep SYNC</i>
-SYNC="rsync://your_server_name/gentoo-portage"
-<comment>(Sync against your local mirror)</comment>
-# <i>emerge --sync</i>
+<pre caption="Define maximum number of connections per IP">
+@badhosts=grep {$hash{$_}>4} keys %hash;
 </pre>
 
-<p>
-That's it! All your computers will now use your local rsync mirror whenever you
-run <c>emerge --sync</c>.
-</p>
+<p> If you use this script, please remember to rotate your rsync log files daily
+and modify the script to match the location of your <path>rsyncd.conf</path>
+file. This script is tested on Gentoo Linux, but should work suitably on other
+arches that support both rsync and perl. </p>
 
 </body>
 </section>
 </chapter>
+
+
+
 </guide>



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2007-12-27 17:22 Shyam Mani
  0 siblings, 0 replies; 16+ messages in thread
From: Shyam Mani @ 2007-12-27 17:22 UTC (permalink / raw
  To: gentoo-doc-cvs

fox2mike    07/12/27 17:22:19

  Modified:             rsync.xml
  Log:
  Sync from rsync.de, not from rsync2.de...

Revision  Changes    Path
1.58                 xml/htdocs/doc/en/rsync.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/rsync.xml?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/rsync.xml?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/rsync.xml?r1=1.57&r2=1.58

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- rsync.xml	25 Dec 2006 18:53:32 -0000	1.57
+++ rsync.xml	27 Dec 2007 17:22:19 -0000	1.58
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.57 2006/12/25 18:53:32 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.58 2007/12/27 17:22:19 fox2mike Exp $ -->
 
 <guide link="/doc/en/rsync.xml" lang="en">
 <title>Gentoo Linux rsync Mirrors Policy and Guide</title>
@@ -24,8 +24,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>3.5</version>
-<date>2006-12-25</date>
+<version>3.6</version>
+<date>2006-12-28</date>
 
 <chapter>
 <title>Preliminaries</title>
@@ -299,7 +299,7 @@
 #Uncomment the following line only if you have been granted access to rsync1.us.gentoo.org
 #SRC="rsync://rsync1.us.gentoo.org/gentoo-portage"
 #If you are waiting for access to our master mirror, select one of our mirrors to mirror from:
-SRC="rsync://rsync2.de.gentoo.org/gentoo-portage"
+SRC="rsync://rsync.de.gentoo.org/gentoo-portage"
 DST="/space/gentoo/rsync/"
 
 echo "Started update at" `date` >> $0.log 2>&amp;1



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2006-12-25 18:53 Josh Saddler
  0 siblings, 0 replies; 16+ messages in thread
From: Josh Saddler @ 2006-12-25 18:53 UTC (permalink / raw
  To: gentoo-doc-cvs

nightmorph    06/12/25 18:53:32

  Modified:             rsync.xml
  Log:
  proper fix of rsync.xml for bug 135910, including a proper revbump. /me smacks jforman's fingers. no cookie for you! :)

Revision  Changes    Path
1.57                 xml/htdocs/doc/en/rsync.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/rsync.xml?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/rsync.xml?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/rsync.xml?r1=1.56&r2=1.57

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- rsync.xml	25 Dec 2006 18:47:22 -0000	1.56
+++ rsync.xml	25 Dec 2006 18:53:32 -0000	1.57
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.56 2006/12/25 18:47:22 jforman Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.57 2006/12/25 18:53:32 nightmorph Exp $ -->
 
 <guide link="/doc/en/rsync.xml" lang="en">
 <title>Gentoo Linux rsync Mirrors Policy and Guide</title>
@@ -25,7 +25,7 @@
 <license/>
 
 <version>3.5</version>
-<date>2006-12-15</date>
+<date>2006-12-25</date>
 
 <chapter>
 <title>Preliminaries</title>
@@ -275,17 +275,8 @@
 
 <p>
 You can pick your own locations for most of the files, of course. What's
-important are the section names (<c>[gentoo-portage]</c> and
-<c>[gentoo-x86-portage]</c>). They are the locations that rsync clients will
-try to sync from.
-</p>
-
-<p>
-Above, the gentoo-x86-portage mirror points to the same data as gentoo-portage.
-Although we have recently changed the official name of our mirror to
-gentoo-portage, gentoo-x86-portage is still needed for backwards compatibility,
-so include both entries. Eventually, the gentoo-x86-portage location will be
-removed.
+important is the section name (<c>[gentoo-portage]</c>). This is the location
+that rsync clients will try to sync from.
 </p>
 
 <p>



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2006-12-25 18:47 undefined
  0 siblings, 0 replies; 16+ messages in thread
From: undefined @ 2006-12-25 18:47 UTC (permalink / raw
  To: gentoo-doc-cvs

jforman     06/12/25 18:47:22

  Modified:             rsync.xml
  Log:
  removed old gentoo-x86-portage repo reference, per bug 135910

Revision  Changes    Path
1.56                 xml/htdocs/doc/en/rsync.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/rsync.xml?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/rsync.xml?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/rsync.xml?r1=1.55&r2=1.56

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- rsync.xml	20 Jul 2006 15:09:29 -0000	1.55
+++ rsync.xml	25 Dec 2006 18:47:22 -0000	1.56
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.55 2006/07/20 15:09:29 rane Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.56 2006/12/25 18:47:22 jforman Exp $ -->
 
 <guide link="/doc/en/rsync.xml" lang="en">
 <title>Gentoo Linux rsync Mirrors Policy and Guide</title>
@@ -24,8 +24,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>3.4</version>
-<date>2006-07-20</date>
+<version>3.5</version>
+<date>2006-12-15</date>
 
 <chapter>
 <title>Preliminaries</title>
@@ -266,11 +266,6 @@
 syslog facility = local3
 timeout = 300
 
-[gentoo-x86-portage]
-#this entry is for compatibility
-path = /gentoo/rsync
-comment = Gentoo Linux Portage tree
-
 [gentoo-portage]
 #modern versions of portage use this entry
 path = /gentoo/rsync



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2006-07-20 15:09 Lukasz Damentko
  0 siblings, 0 replies; 16+ messages in thread
From: Lukasz Damentko @ 2006-07-20 15:09 UTC (permalink / raw
  To: gentoo-doc-cvs

rane        06/07/20 15:09:29

  Modified:             rsync.xml
  Log:
  #141169, the script lacked RSYNC variable and was failing

Revision  Changes    Path
1.55                 xml/htdocs/doc/en/rsync.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.55&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.55&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml.diff?r1=1.54&r2=1.55&cvsroot=gentoo

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- rsync.xml	17 Jul 2006 18:03:02 -0000	1.54
+++ rsync.xml	20 Jul 2006 15:09:29 -0000	1.55
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.54 2006/07/17 18:03:02 rane Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.55 2006/07/20 15:09:29 rane Exp $ -->
 
 <guide link="/doc/en/rsync.xml" lang="en">
 <title>Gentoo Linux rsync Mirrors Policy and Guide</title>
@@ -24,8 +24,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>3.3</version>
-<date>2006-06-04</date>
+<version>3.4</version>
+<date>2006-07-20</date>
 
 <chapter>
 <title>Preliminaries</title>
@@ -308,7 +308,7 @@
 <pre caption="rsync-gentoo-portage.sh">
 #!/bin/bash
 
-
+RSYNC="/usr/bin/rsync"
 OPTS="--quiet --recursive --links --perms --times -D --delete --timeout=300"
 #Uncomment the following line only if you have been granted access to rsync1.us.gentoo.org
 #SRC="rsync://rsync1.us.gentoo.org/gentoo-portage"



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2006-07-17 18:03 Lukasz Damentko
  0 siblings, 0 replies; 16+ messages in thread
From: Lukasz Damentko @ 2006-07-17 18:03 UTC (permalink / raw
  To: gentoo-doc-cvs

rane        06/07/17 18:03:02

  Modified:             rsync.xml
  Log:
  fixing a typo, no content changes

Revision  Changes    Path
1.54                 xml/htdocs/doc/en/rsync.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.54&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.54&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml.diff?r1=1.53&r2=1.54&cvsroot=gentoo

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- rsync.xml	19 Jun 2006 12:08:14 -0000	1.53
+++ rsync.xml	17 Jul 2006 18:03:02 -0000	1.54
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.53 2006/06/19 12:08:14 flammie Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.54 2006/07/17 18:03:02 rane Exp $ -->
 
 <guide link="/doc/en/rsync.xml" lang="en">
 <title>Gentoo Linux rsync Mirrors Policy and Guide</title>
@@ -206,7 +206,7 @@
 </p>
 
 <pre caption="Define SYNC in /etc/make.conf">
-<comment>(Use your server IP addess)</comment>
+<comment>(Use your server IP address)</comment>
 SYNC="rsync://<i>192.168.0.1</i>/gentoo-portage"
 <comment>(Or use your server name)</comment>
 SYNC="rsync://<i>your_server_name</i>/gentoo-portage"



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2006-06-04 19:40 undefined
  0 siblings, 0 replies; 16+ messages in thread
From: undefined @ 2006-06-04 19:40 UTC (permalink / raw
  To: gentoo-doc-cvs

jforman     06/06/04 19:40:46

  Modified:             rsync.xml
  Log:
  fix to rsync options, submitted by tobias klausmann

Revision  Changes    Path
1.52                 xml/htdocs/doc/en/rsync.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.52&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.52&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml.diff?r1=1.51&r2=1.52&cvsroot=gentoo

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- rsync.xml	23 May 2006 18:21:55 -0000	1.51
+++ rsync.xml	4 Jun 2006 19:40:46 -0000	1.52
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.51 2006/05/23 18:21:55 jkt Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.52 2006/06/04 19:40:46 jforman Exp $ -->
 
 <guide link="/doc/en/rsync.xml" lang="en">
 <title>Gentoo Linux rsync Mirrors Policy and Guide</title>
@@ -24,8 +24,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>3.2</version>
-<date>2006-05-23</date>
+<version>3.3</version>
+<date>2006-06-04</date>
 
 <chapter>
 <title>Preliminaries</title>
@@ -308,8 +308,8 @@
 <pre caption="rsync-gentoo-portage.sh">
 #!/bin/bash
 
-RSYNC="/usr/bin/rsync"
-OPTS="--quiet --recursive --links --perms --times --devices --delete --timeout=300"
+
+OPTS="--quiet --recursive --links --perms --times -D --delete --timeout=300"
 #Uncomment the following line only if you have been granted access to rsync1.us.gentoo.org
 #SRC="rsync://rsync1.us.gentoo.org/gentoo-portage"
 #If you are waiting for access to our master mirror, select one of our mirrors to mirror from:



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2006-05-23 18:21 Jan Kundrat
  0 siblings, 0 replies; 16+ messages in thread
From: Jan Kundrat @ 2006-05-23 18:21 UTC (permalink / raw
  To: gentoo-doc-cvs

jkt         06/05/23 18:21:55

  Modified:             rsync.xml
  Log:
  version & date bump for previous commit

Revision  Changes    Path
1.51                 xml/htdocs/doc/en/rsync.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.51&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.51&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml.diff?r1=1.50&r2=1.51&cvsroot=gentoo

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- rsync.xml	23 May 2006 16:40:26 -0000	1.50
+++ rsync.xml	23 May 2006 18:21:55 -0000	1.51
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.50 2006/05/23 16:40:26 jforman Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.51 2006/05/23 18:21:55 jkt Exp $ -->
 
 <guide link="/doc/en/rsync.xml" lang="en">
 <title>Gentoo Linux rsync Mirrors Policy and Guide</title>
@@ -24,8 +24,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>3.1</version>
-<date>2006-05-12</date>
+<version>3.2</version>
+<date>2006-05-23</date>
 
 <chapter>
 <title>Preliminaries</title>



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2006-05-23 16:40 undefined
  0 siblings, 0 replies; 16+ messages in thread
From: undefined @ 2006-05-23 16:40 UTC (permalink / raw
  To: gentoo-doc-cvs

jforman     06/05/23 16:40:27

  Modified:             rsync.xml
  Log:
  changed contact info from jforman to mirror-admins

Revision  Changes    Path
1.50                 xml/htdocs/doc/en/rsync.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.50&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.50&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml.diff?r1=1.49&r2=1.50&cvsroot=gentoo

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- rsync.xml	12 May 2006 20:07:07 -0000	1.49
+++ rsync.xml	23 May 2006 16:40:26 -0000	1.50
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.49 2006/05/12 20:07:07 neysx Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.50 2006/05/23 16:40:26 jforman Exp $ -->
 
 <guide link="/doc/en/rsync.xml" lang="en">
 <title>Gentoo Linux rsync Mirrors Policy and Guide</title>
@@ -69,8 +69,8 @@
 </p>
 
 <p>
-If you would like to donate your machine, please email <mail
-link="jforman@gentoo.org">Jeffrey Forman</mail> with the pertinent
+If you would like to donate your machine, please email the <mail
+link="mirror-admin@gentoo.org">Mirror Admins</mail> with the pertinent
 information.
 </p>
 



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2006-05-12 20:07 Xavier Neys
  0 siblings, 0 replies; 16+ messages in thread
From: Xavier Neys @ 2006-05-12 20:07 UTC (permalink / raw
  To: gentoo-doc-cvs

neysx       06/05/12 20:07:07

  Modified:             rsync.xml
  Log:
  Fixed utterly broken coding style and a couple of typos

Revision  Changes    Path
1.49                 xml/htdocs/doc/en/rsync.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.49&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.49&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml.diff?r1=1.48&r2=1.49&cvsroot=gentoo

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- rsync.xml	12 May 2006 12:59:39 -0000	1.48
+++ rsync.xml	12 May 2006 20:07:07 -0000	1.49
@@ -1,25 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.48 2006/05/12 12:59:39 jforman Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.49 2006/05/12 20:07:07 neysx Exp $ -->
 
 <guide link="/doc/en/rsync.xml" lang="en">
 <title>Gentoo Linux rsync Mirrors Policy and Guide</title>
 
-<author title="Author, new version">
-  Tobias Klausmann
-</author>
-
-<author title="Original Author">
+<author title="Author">
   <mail link="mirror-admin@gentoo.org">Gentoo Mirror Administrators</mail>
 </author>
-<author title="Original Editor">
-  <mail link="neysx@gentoo.org">Xavier Neys</mail>
-</author>
-<author title="Contributor">
+<author title="Author">
   <mail link="klausman-gentoo@schwarzvogel.de">Tobias Klausmann</mail>
 </author>
-
-
+<author title="Editor">
+  <mail link="neysx@gentoo.org">Xavier Neys</mail>
+</author>
 
 <abstract>
 This document explains how to set up a official rsync mirror and your own local
@@ -30,7 +24,7 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>3.0</version>
+<version>3.1</version>
 <date>2006-05-12</date>
 
 <chapter>
@@ -41,21 +35,24 @@
 
 <p>
 This guide is intended for people who would like to set up an rsync mirror of
-their own. I caters not only to those who want to run an official rsync mirror
+their own. It caters not only to those who want to run an official rsync mirror
 but also those wanting to run private mirrors.
 </p>
 
-<p>There are three kinds of Gentoo rsync mirrors: main rotation mirrors,
-community mirrors and private mirrors. Main rotation mirrors are maintained by
-the Gentoo infrastructure team. They handle the bulk of the Gentoo rsync
-traffic. The community mirrors are run by volunteers from the Gentoo community.
-Private mirrors are mirrors run by individuals which are closed off to the
-public and meant to cut traffic costs and latency for an organization or
-individual.</p>
+<p>
+There are three kinds of Gentoo rsync mirrors: main rotation mirrors, community
+mirrors and private mirrors. Main rotation mirrors are maintained by the Gentoo
+infrastructure team. They handle the bulk of the Gentoo rsync traffic. The
+community mirrors are run by volunteers from the Gentoo community.  Private
+mirrors are mirrors run by individuals which are closed off to the public and
+meant to cut traffic costs and latency for an organization or individual.
+</p>
 
-<p>At this time, we have enough community mirrors and are actively seeking
+<p>
+At this time, we have enough community mirrors and are actively seeking
 additional main rotation mirrors. Specifications for main rotation servers
-include:</p>
+include:
+</p>
 
 <ul>
   <li>Minimum of a 2GHz Pentium 4 processor (or equivalent)</li>
@@ -65,49 +62,57 @@
 
 <p>
 These servers may be donated with bandwidth and colocation space if you have
-them.  Otherwise, we can provide these services and you can simply ship the
+them. Otherwise, we can provide these services and you can simply ship the
 machine to our colocation facility.  Average bandwidth consumption for a main
-rotation mirror is currently ~7Mbps (around 2 TB per month).  As the number of
+rotation mirror is currently ~7Mbps (around 2 TB per month). As the number of
 main rotation mirrors increases, this number should decrease accordingly.
 </p>
 
 <p>
 If you would like to donate your machine, please email <mail
-link="jforman@gentoo.org">Jeffrey Forman</mail> with the pertinent information. 
+link="jforman@gentoo.org">Jeffrey Forman</mail> with the pertinent
+information.
 </p>
 
 </body>
 </section>
 </chapter>
 
-<chapter>
+<chapter id="local">
 <title>Setting up your own local rsync mirror</title>
 <section>
 <title>Introduction</title>
 <body>
 
-<p>Many users run Gentoo on several machines and need to sync the portage trees
-on all of them. Using public mirrors is simply a waste of bandwidth at both
-ends. Syncing only one machine against a public mirror and all others against
-that computer would save resources on Gentoo mirrors and save users' bandwidth.
+<p>
+Many users run Gentoo on several machines and need to sync the portage trees on
+all of them. Using public mirrors is simply a waste of bandwidth at both ends.
+Syncing only one machine against a public mirror and all others against that
+computer would save resources on Gentoo mirrors and save users' bandwidth.
 </p>
 
-<p>The same holds true for organizations who would like to control the rsync
-mirror their servers and workstations sync against. Of course, they usually also
-want to save on badnwidth and traffic costs. </p>
-
-<p>All you need to do is select which machine is going to be your own local
-rsync mirror and set it up. You should choose a computer that can handle the CPU
-and disk load that an rsync operation require. Your local mirror also needs to
-be available whenever any of your other computers syncs its portage tree.
+<p>
+The same holds true for organizations who would like to control the rsync
+mirror their servers and workstations sync against. Of course, they usually
+also want to save on bandwidth and traffic costs.
+</p>
+
+<p>
+All you need to do is select which machine is going to be your own local rsync
+mirror and set it up. You should choose a computer that can handle the CPU and
+disk load that an rsync operation requires. Your local mirror also needs to be
+available whenever any of your other computers syncs its portage tree.
 Besides, it should have a static IP address or a name that always resolves to
-your server.  Configuring a DHCP and/or a DNS server is beyond the scope of this
-guide.</p>
+your server. Configuring a DHCP and/or a DNS server is beyond the scope of this
+guide.
+</p>
 
-<p>Note that these instructions assume your private rsync mirror is a Gentoo
+<p>
+Note that these instructions assume your private rsync mirror is a Gentoo
 machine. If you intend to run it on a different distribution, the guide for
 setting up a community mirror might be more helpful. Just don't sync the mirror
-every half hour but once or twice a day.</p>
+every half hour but once or twice a day.
+</p>
 
 </body>
 </section>
@@ -115,11 +120,13 @@
 <title>Setting up the server</title>
 <body>
 
-<p>There is no extra package to install as the required software is already on
-your computer.Setting up your own local rsync mirror is just a matter of
-configuring the <e>rsyncd</e> daemon to make your <path>/usr/portage</path>
+<p>
+There is no extra package to install as the required software is already on
+your computer. Setting up your own local rsync mirror is just a matter of
+configuring the <c>rsyncd</c> daemon to make your <path>/usr/portage</path>
 directory available for syncing. Create the following
-<path>/etc/rsyncd.conf</path> configuration file: </p>
+<path>/etc/rsyncd.conf</path> configuration file:
+</p>
 
 <pre caption="Sample /etc/rsyncd.conf">
 pid file = /var/run/rsyncd.pid
@@ -137,16 +144,19 @@
 exclude=distfiles/ packages/
 </pre>
 
-<p> You do not need to use the <c>hosts allow</c> and <c>hosts deny</c> options.
-By default, all clients will be allowed to connect. The order in which you write
-the options is not relevant. The server will always check the <c>hosts allow</c>
-option first and grant the connection if the connecting host matches any of the
-listed patterns. The server will then check the <c>hosts deny</c> option and
-refuse the connection if any match is found. Any host that does not match
-anything will be granted a connection. Please read the man page (<c>man
-rsyncd.conf</c>) for more information. </p>
+<p>
+You do not need to use the <c>hosts allow</c> and <c>hosts deny</c> options.
+By default, all clients will be allowed to connect. The order in which you
+write the options is not relevant. The server will always check the <c>hosts
+allow</c> option first and grant the connection if the connecting host matches
+any of the listed patterns. The server will then check the <c>hosts deny</c>
+option and refuse the connection if any match is found. Any host that does not
+match anything will be granted a connection. Please read the man page (<c>man
+rsyncd.conf</c>) for more information.
+</p>
 
-<p> Now, start your rsync daemon with the following command as the root user:
+<p>
+Now, start your rsync daemon with the following command as the root user:
 </p>
 
 <pre caption="Starting the rsync daemon">
@@ -156,9 +166,11 @@
 # <i>rc-update add rsyncd default</i>
 </pre>
 
-<p> Let's test your rsync mirror. You do not need to try from another machine
-but it would be a good idea to do so. If your server is not known by name from
-all your computers, you can use its IP address instead. </p>
+<p>
+Let's test your rsync mirror. You do not need to try from another machine but
+it would be a good idea to do so. If your server is not known by name from all
+your computers, you can use its IP address instead.
+</p>
 
 <pre caption="Testing your mirror">
 <comment>(You may use the server name or its IP)</comment>
@@ -168,14 +180,18 @@
 <comment>(You should see the content of /usr/portage on your mirror)</comment>
 </pre>
 
-<p> Your rsync mirror is now set up. Keep running <c>emerge --sync</c> as you
-have done so far to keep your server up-to-date. If you use cron or similar
+<p>
+Your rsync mirror is now set up. Keep running <c>emerge --sync</c> as you have
+done so far to keep your server up-to-date. If you use cron or similar
 facilities to sync regularly, remember to keep it down to a sensible frequency
-like once or twice a day.</p>
+like once or twice a day.
+</p>
 
-<note> Please note that most public mirror administrators consider syncing more
-than once or twice a day an abuse. Some if not most of them will ban your IP
-from their server if you start abusing their machines.</note>
+<note>
+Please note that most public mirror administrators consider syncing more than
+once or twice a day an abuse. Some if not most of them will ban your IP from
+their server if you start abusing their machines.
+</note>
 
 </body>
 </section>
@@ -183,9 +199,11 @@
 <title>Configuring your clients</title>
 <body>
 
-<p> Now, make your other computers use your own local rsync mirror instead of a
+<p>
+Now, make your other computers use your own local rsync mirror instead of a
 public one. Edit your <path>/etc/make.conf</path> and make the <c>SYNC</c>
-variable point to your server. </p>
+variable point to your server.
+</p>
 
 <pre caption="Define SYNC in /etc/make.conf">
 <comment>(Use your server IP addess)</comment>
@@ -194,8 +212,10 @@
 SYNC="rsync://<i>your_server_name</i>/gentoo-portage"
 </pre>
 
-<p> You can check that your computer has been properly set up by syncing against
-your own local mirror for the first time: </p>
+<p>
+You can check that your computer has been properly set up by syncing against
+your own local mirror for the first time:
+</p>
 
 <pre caption="Checking and syncing">
 <comment>(Check that the SYNC variable has been setup)</comment>
@@ -205,28 +225,32 @@
 # <i>emerge --sync</i>
 </pre>
 
-<p> That's it! All your computers will now use your local rsync mirror whenever
-you run <c>emerge --sync</c>. </p>
+<p>
+That's it! All your computers will now use your local rsync mirror whenever you
+run <c>emerge --sync</c>.
+</p>
 
 </body>
 </section>
 </chapter>
 
-
 <chapter>
 <title>Setting up a community rsync server</title>
 <section>
 <title>Introduction</title>
 <body>
 
-<note> You can find sample configuration and script files in the
-gentoo-rsync-mirror package. Just do <c>emerge gentoo-rsync-mirror</c> </note>
+<note>
+You can find sample configuration and script files in the gentoo-rsync-mirror
+package. Just do <c>emerge gentoo-rsync-mirror</c>.
+</note>
 
 <p>
 Right now, mirroring our Portage tree requires around 600Mb, so it isn't space
-intensive; having at least 1Gb free should allow for growing room. Setting
-up a Portage tree mirror is simple -- first, ensure that your mirror has rsync
-installed. Then, set up your <path>rsyncd.conf</path> file to look something like this:
+intensive; having at least 1Gb free should allow for growing room. Setting up a
+Portage tree mirror is simple -- first, ensure that your mirror has rsync
+installed. Then, set up your <path>rsyncd.conf</path> file to look something
+like this:
 </p>
 
 <pre caption="rsyncd.conf">
@@ -254,24 +278,32 @@
 exclude = distfiles
 </pre>
 
-<p>You can pick your own locations for most of the files, of course. What's
+<p>
+You can pick your own locations for most of the files, of course. What's
 important are the section names (<c>[gentoo-portage]</c> and
-<c>[gentoo-x86-portage]</c>). They are the locations that rsync clients will try
-to sync from</p>
+<c>[gentoo-x86-portage]</c>). They are the locations that rsync clients will
+try to sync from.
+</p>
 
-<p>Above, the gentoo-x86-portage mirror points to the same data as
-gentoo-portage. Although we have recently changed the official name of our
-mirror to gentoo-portage, gentoo-x86-portage is still needed for backwards
-compatibility, so include both entries. Eventually, the gentoo-x86-portage
-location will be removed.</p>
+<p>
+Above, the gentoo-x86-portage mirror points to the same data as gentoo-portage.
+Although we have recently changed the official name of our mirror to
+gentoo-portage, gentoo-x86-portage is still needed for backwards compatibility,
+so include both entries. Eventually, the gentoo-x86-portage location will be
+removed.
+</p>
 
-<p> For security reasons, the use of a chrooted environment is required! This
-has implications for the logged timestamps -- see the FAQ below.</p>
+<p>
+For security reasons, the use of a chrooted environment is required! This has
+implications for the logged timestamps -- see the FAQ below.
+</p>
 
-<p> Now, you need to mirror the Gentoo Linux Portage tree. You can use the
-script below to do so. Again, you'll probably want to change some of the file
+<p>
+Now, you need to mirror the Gentoo Linux Portage tree. You can use the script
+below to do so. Again, you'll probably want to change some of the file
 locations to suit your needs -- in particular, they should match those of your
-<path>rsyncd.conf</path>.</p>
+<path>rsyncd.conf</path>.
+</p>
 
 <pre caption="rsync-gentoo-portage.sh">
 #!/bin/bash
@@ -288,18 +320,22 @@
 logger -t rsync "re-rsyncing the gentoo-portage tree"
 ${RSYNC} ${OPTS} ${SRC} ${DST} >> $0.log 2>&amp;1
 
-echo "End: "`date` >> $0.log 2>&amp;1 
+echo "End: "`date` >> $0.log 2>&amp;1
 </pre>
 
-<p> Your <path>rsyncd.motd</path> should contain your IP address and other
-relevant information about your mirror, such as information about the host
-providing the Portage mirror and an administrative contact.You can now test your
-server as outlined in the "Setting up your own local rsync mirror" section
-above.</p>
+<p>
+Your <path>rsyncd.motd</path> should contain your IP address and other relevant
+information about your mirror, such as information about the host providing the
+Portage mirror and an administrative contact. You can now test your server as
+outlined in the <uri link="#local">Setting up your own local rsync
+mirror</uri> chapter above.
+</p>
 
-<p> After you have been approved as an official rsync mirror your host will be
+<p>
+After you have been approved as an official rsync mirror, your host will be
 aliased with a name of the form: <path>rsync[num].[country
-code].gentoo.org</path> </p> 
+code].gentoo.org</path>.
+</p>
 
 </body>
 </section>
@@ -311,33 +347,41 @@
 <title>Q: Who should I contact regarding rsync issues and maintenance?</title>
 <body>
 
-<p> A: Visit <uri link="http://bugs.gentoo.org">Gentoo Bugzilla</uri> and fill
-out a bug on the product "Mirrors", component "Server Problem". </p>
+<p>
+A: Visit <uri link="http://bugs.gentoo.org">Gentoo Bugzilla</uri> and fill out
+a bug on the product "Mirrors", component "Server Problem".
+</p>
 
 </body>
 </section>
 
 <section>
 <title>Q: How can I check the freshness of an official rsync server?</title>
-<body> 
-<p>The Gentoo infrastructure team monitors all community rsync servers for
-freshness. You can see the results on the <uri link="http://mirrorstats.gentoo.org/rsync">corresponding web page</uri>. 
-</p></body>
-</section>
+<body>
 
+<p>
+The Gentoo infrastructure team monitors all community rsync servers for
+freshness. You can see the results on the <uri
+link="http://mirrorstats.gentoo.org/rsync">corresponding web page</uri>.
+</p>
+
+</body>
+</section>
 <section>
 <title>Q: I run a private rsync mirror for my company. Can I still access
-rsync1.us.gentoo.org?</title> 
+rsync1.us.gentoo.org?</title>
 
 <body>
 
-<p> A: Because our resources are limited, we need to ensure we allocate them in
-such a way as to provide the maximum amount of benefit to our users. As such, we
-limit connections to our master rsync and distfile mirrors to public mirrors
+<p>
+A: Because our resources are limited, we need to ensure we allocate them in
+such a way as to provide the maximum amount of benefit to our users. As such,
+we limit connections to our master rsync and distfile mirrors to public mirrors
 only. Users are welcome to use our regular mirror system to establish a private
 rsync mirror, though they are asked to follow certain basic <uri
-link="http://www.gentoo.org/news/en/gwn/20030505-newsletter.xml#doc_chap1_sect3">
-rsync etiquette guidelines</uri>. </p>
+link="/news/en/gwn/20030505-newsletter.xml#doc_chap1_sect3">rsync etiquette
+guidelines</uri>.
+</p>
 
 </body>
 </section>
@@ -345,8 +389,9 @@
 <title>Q: Is it important that I sync my mirror twice an hour?</title>
 <body>
 
-<p> A: Yes it is important.  You do not need to perform the syncs at exactly :00
-and :30 but the syncs should take place in each of the following two windows:
+<p>
+A: Yes it is important. You do not need to perform the syncs at exactly :00 and
+:30 but the syncs should take place in each of the following two windows:
 </p>
 
 <ol>
@@ -354,14 +399,14 @@
   <li>:30 to :40</li>
 </ol>
 
-<p> Additionally, please make sure that your syncs are exactly 30 minutes apart.
+<p>
+Additionally, please make sure that your syncs are exactly 30 minutes apart.
 So, if you schedule the first sync of each hour for :08, please schedule the
 second sync of the hour for :38.
 </p>
 
 </body>
 </section>
-
 <section>
 <title>Q: Where should I sync my rsync mirror before I become an official Gentoo mirror?</title>
 <body>
@@ -379,28 +424,30 @@
 <title>Q: How do I find the mirror nearest to me?</title>
 <body>
 
-<p> A: <c>netselect</c> was designed to do this for you. If you haven't already
-run <c>emerge netselect</c> then do it. Then run: <c>netselect
+<p>
+A: <c>netselect</c> was designed to do this for you. If you haven't already run
+<c>emerge netselect</c> then do it. Then run: <c>netselect
 rsync.gentoo.org</c>. After a minute or so netselect will print an IP address.
 Take this address and use it as the only parameter for rsync with two colons
-appended to it. eg: <c>rsync 1.2.3.4::</c>. You should be able to find out which
-mirror that is from the banner message. Update your <path>/etc/make.conf</path>
-accordingly. </p>
+appended to it. eg: <c>rsync 1.2.3.4::</c>. You should be able to find out
+which mirror that is from the banner message. Update your
+<path>/etc/make.conf</path> accordingly.
+</p>
 
 </body>
 </section>
-
 <section>
 <title>Q: Can I use compression when syncing against rsync1.us.gentoo.org?</title>
 <body>
 
-<p> A: No. Compression utilizes too many resources on the server, so we have
+<p>
+A: No. Compression utilizes too many resources on the server, so we have
 forcibly disabled it on <path>rsync1.us.gentoo.org</path>. Please <e>do not</e>
-attempt to use compression when syncing against this server. </p>
+attempt to use compression when syncing against this server.
+</p>
 
 </body>
 </section>
-
 <section>
 <title>Q: I'm seeing a lot of old and probably dead rsync processes, how can I
 get rid of them?</title>
@@ -416,7 +463,7 @@
 
 <pre caption="Kill old rsync processes">
 /bin/kill -9 `/bin/ps --no-headers -Crsync -o etime,user,pid,command|/bin/grep nobody | \
-             /bin/grep "[0-9]\{2\}:[0-9]\{2\}:" |/bin/awk '{print $3}'` 
+             /bin/grep "[0-9]\{2\}:[0-9]\{2\}:" |/bin/awk '{print $3}'`
 </pre>
 
 </body>
@@ -429,30 +476,30 @@
 
 <p>
 In some cases, there are a few inconsiderate users who abuse the rsync mirror
-system by syncing more than 1-2 times per day.  In the most extreme cases, users
-schedule cron jobs to sync every 15 minutes or so.  This often leads to a Denial
-of Service attack by continually occupying an rsync slot that could have
+system by syncing more than 1-2 times per day.  In the most extreme cases,
+users schedule cron jobs to sync every 15 minutes or so.  This often leads to a
+Denial of Service attack by continually occupying an rsync slot that could have
 otherwise gone to another user.  To try and prevent this, you may use the <uri
-link="/proj/en/infrastructure/mirrors/rsyncd.conf_pl.txt">this perl script</uri>
-which will scan through your rsync log files, pick out IP addresses that have
-already connected more than <c>N</c> times that day and dynamically create a
-<path>rsyncd.conf</path> file, including the offending IP addresses in the
+link="/proj/en/infrastructure/mirrors/rsyncd.conf_pl.txt">this perl
+script</uri> which will scan your rsync log files, pick out IP addresses that
+have already connected more than <c>N</c> times that day and dynamically create
+a <path>rsyncd.conf</path> file, including the offending IP addresses in the
 'hosts deny' directive.  The following line controls what <c>N</c> equals (in
-this case 4): </p>
+this case 4):
+</p>
 
 <pre caption="Define maximum number of connections per IP">
 @badhosts=grep {$hash{$_}>4} keys %hash;
 </pre>
 
-<p> If you use this script, please remember to rotate your rsync log files daily
+<p>
+If you use this script, please remember to rotate your rsync log files daily
 and modify the script to match the location of your <path>rsyncd.conf</path>
 file. This script is tested on Gentoo Linux, but should work suitably on other
-arches that support both rsync and perl. </p>
+arches that support both rsync and perl.
+</p>
 
 </body>
 </section>
 </chapter>
-
-
-
 </guide>



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2006-05-12 12:59 undefined
  0 siblings, 0 replies; 16+ messages in thread
From: undefined @ 2006-05-12 12:59 UTC (permalink / raw
  To: gentoo-doc-cvs

jforman     06/05/12 12:59:39

  Modified:             rsync.xml
  Log:
  update tobias's email address

Revision  Changes    Path
1.48                 xml/htdocs/doc/en/rsync.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.48&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.48&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml.diff?r1=1.47&r2=1.48&cvsroot=gentoo

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- rsync.xml	12 May 2006 11:21:10 -0000	1.47
+++ rsync.xml	12 May 2006 12:59:39 -0000	1.48
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.47 2006/05/12 11:21:10 jforman Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.48 2006/05/12 12:59:39 jforman Exp $ -->
 
 <guide link="/doc/en/rsync.xml" lang="en">
 <title>Gentoo Linux rsync Mirrors Policy and Guide</title>
@@ -16,7 +16,7 @@
   <mail link="neysx@gentoo.org">Xavier Neys</mail>
 </author>
 <author title="Contributor">
-  <mail link="klausman@schwarzvogel.de">Tobias Klausmann</mail>
+  <mail link="klausman-gentoo@schwarzvogel.de">Tobias Klausmann</mail>
 </author>
 
 



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2005-12-12 16:04 Xavier Neys
  0 siblings, 0 replies; 16+ messages in thread
From: Xavier Neys @ 2005-12-12 16:04 UTC (permalink / raw
  To: gentoo-doc-cvs

neysx       05/12/12 16:04:32

  Modified:    xml/htdocs/doc/en rsync.xml
  Log:
  s/.us./.de./

Revision  Changes    Path
1.45      +5 -5      xml/htdocs/doc/en/rsync.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.45&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.45&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml.diff?r1=1.44&r2=1.45&cvsroot=gentoo

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- rsync.xml	11 Dec 2005 10:07:42 -0000	1.44
+++ rsync.xml	12 Dec 2005 16:04:32 -0000	1.45
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding="UTF-8"?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.44 2005/12/11 10:07:42 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.45 2005/12/12 16:04:32 neysx Exp $ -->
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
 <guide link="/doc/en/rsync.xml">
@@ -18,8 +18,8 @@
 
 <license/>
 
-<version>1.12</version>
-<date>2005-11-07</date>
+<version>1.13</version>
+<date>2005-12-12</date>
 
 <chapter>
 <title>Hardware Request</title>
@@ -280,12 +280,12 @@
 </section>
 
 <section>
-<title>Where should I sync my rsync mirror before I become an official Gentoo mirror?</title>
+<title>Q: Where should I sync my rsync mirror before I become an official Gentoo mirror?</title>
 <body>
 
 <ul>
   <li>I am a European-based rsync mirror: sync to rsync.de.gentoo.org</li>
-  <li>I am a US-based rsync mirror: sync to rsync.de.gentoo.org</li>
+  <li>I am a US-based rsync mirror: sync to rsync.us.gentoo.org</li>
   <li>I am not in the first two groups: sync to rsync.us.gentoo.org</li>
 </ul>
 



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2005-12-11 10:07 swift
  0 siblings, 0 replies; 16+ messages in thread
From: swift @ 2005-12-11 10:07 UTC (permalink / raw
  To: gentoo-doc-cvs

swift       05/12/11 10:07:42

  Modified:    xml/htdocs/doc/en rsync.xml
  Log:
  Coding style, no content change

Revision  Changes    Path
1.44      +6 -4      xml/htdocs/doc/en/rsync.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.44&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.44&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml.diff?r1=1.43&r2=1.44&cvsroot=gentoo

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- rsync.xml	11 Dec 2005 01:22:42 -0000	1.43
+++ rsync.xml	11 Dec 2005 10:07:42 -0000	1.44
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding="UTF-8"?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.43 2005/12/11 01:22:42 jforman Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.44 2005/12/11 10:07:42 swift Exp $ -->
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
 <guide link="/doc/en/rsync.xml">
@@ -282,11 +282,13 @@
 <section>
 <title>Where should I sync my rsync mirror before I become an official Gentoo mirror?</title>
 <body>
+
 <ul>
-	<li>I am a European-based rsync mirror: sync to rsync.de.gentoo.org</li>
-	<li>I am a US-based rsync mirror: sync to rsync.de.gentoo.org</li>
-	<li>I am not in the first two groups: sync to rsync.us.gentoo.org</li>
+  <li>I am a European-based rsync mirror: sync to rsync.de.gentoo.org</li>
+  <li>I am a US-based rsync mirror: sync to rsync.de.gentoo.org</li>
+  <li>I am not in the first two groups: sync to rsync.us.gentoo.org</li>
 </ul>
+
 </body>
 </section>
 <section>



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2005-12-11  1:22 undefined
  0 siblings, 0 replies; 16+ messages in thread
From: undefined @ 2005-12-11  1:22 UTC (permalink / raw
  To: gentoo-doc-cvs

jforman     05/12/11 01:22:43

  Modified:    xml/htdocs/doc/en rsync.xml
  Log:
  added section about where to sync before becoming official mirror

Revision  Changes    Path
1.43      +12 -1     xml/htdocs/doc/en/rsync.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.43&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.43&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml.diff?r1=1.42&r2=1.43&cvsroot=gentoo

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- rsync.xml	7 Nov 2005 11:54:16 -0000	1.42
+++ rsync.xml	11 Dec 2005 01:22:42 -0000	1.43
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding="UTF-8"?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.42 2005/11/07 11:54:16 neysx Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.43 2005/12/11 01:22:42 jforman Exp $ -->
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
 <guide link="/doc/en/rsync.xml">
@@ -278,6 +278,17 @@
 
 </body>
 </section>
+
+<section>
+<title>Where should I sync my rsync mirror before I become an official Gentoo mirror?</title>
+<body>
+<ul>
+	<li>I am a European-based rsync mirror: sync to rsync.de.gentoo.org</li>
+	<li>I am a US-based rsync mirror: sync to rsync.de.gentoo.org</li>
+	<li>I am not in the first two groups: sync to rsync.us.gentoo.org</li>
+</ul>
+</body>
+</section>
 <section>
 <title>Q: How do I find the mirror nearest to me?</title>
 <body>



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2005-11-07 11:54 Xavier Neys
  0 siblings, 0 replies; 16+ messages in thread
From: Xavier Neys @ 2005-11-07 11:54 UTC (permalink / raw
  To: gentoo-doc-cvs

neysx       05/11/07 11:54:16

  Modified:    xml/htdocs/doc/en rsync.xml
  Log:
  #111691 Improved markup

Revision  Changes    Path
1.42      +11 -11    xml/htdocs/doc/en/rsync.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.42&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.42&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml.diff?r1=1.41&r2=1.42&cvsroot=gentoo

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- rsync.xml	7 Nov 2005 11:47:06 -0000	1.41
+++ rsync.xml	7 Nov 2005 11:54:16 -0000	1.42
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding="UTF-8"?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.41 2005/11/07 11:47:06 neysx Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.42 2005/11/07 11:54:16 neysx Exp $ -->
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
 <guide link="/doc/en/rsync.xml">
@@ -18,8 +18,8 @@
 
 <license/>
 
-<version>1.11</version>
-<date>2005-04-24</date>
+<version>1.12</version>
+<date>2005-11-07</date>
 
 <chapter>
 <title>Hardware Request</title>
@@ -283,12 +283,12 @@
 <body>
 
 <p>
-A: netselect was designed to do this for you. If you haven't already run
+A: <c>netselect</c> was designed to do this for you. If you haven't already run
 <c>emerge netselect</c> then do it. Then run: <c>netselect rsync.gentoo.org</c>.
 After a minute or so netselect will print an IP address. Take this address and
 use it as the only parameter for rsync with two colons appended to it. eg:
 <c>rsync 1.2.3.4::</c>. You should be able to find out which mirror that is
-from the banner message. Update your /etc/make.conf accordingly.
+from the banner message. Update your <path>/etc/make.conf</path> accordingly.
 </p>
 
 </body>
@@ -342,7 +342,7 @@
 Right now, mirroring our Portage tree requires around 250Mb, so it isn't space
 intensive; having at least 500Mb free should allow for growing room. Setting
 up a Portage tree mirror is simple -- first, ensure that your mirror has rsync
-installed. Then, set up your rsyncd.conf file to look something like this:
+installed. Then, set up your <path>rsyncd.conf</path> file to look something like this:
 </p>
 
 <pre caption="rsyncd.conf">
@@ -431,7 +431,7 @@
 </pre>
 
 <p>
-Your rsyncd.motd should contain your IP address and other relevant information
+Your <path>rsyncd.motd</path> should contain your IP address and other relevant information
 about your mirror, such as information about the host providing the Portage
 mirror and an administrative contact. After you have been approved as an
 official rsync mirror your host will be aliased with a name of the form:
@@ -460,7 +460,7 @@
 following <uri link="/proj/en/infrastructure/mirrors/rsyncd.conf_pl.txt">perl
 script</uri> which will scan through your rsync log files, pick out IP
 addresses that have already connected more than <c>N</c> times that day and
-dynamically create a rsyncd.conf file, including the offending IP addresses in
+dynamically create a <path>rsyncd.conf</path> file, including the offending IP addresses in
 the 'hosts deny' directive.  The following line controls what <c>N</c> equals:
 </p>
 
@@ -470,9 +470,9 @@
 
 <p>
 If you use this script, please remember to rotate your rsync log files daily
-and modify the script to match the location of your rsyncd.conf file.  This
-script is tested on Gentoo Linux, but should work suitably on other arches that
-support both rsync and perl.  
+and modify the script to match the location of your <path>rsyncd.conf</path>
+file. This script is tested on Gentoo Linux, but should work suitably on other
+arches that support both rsync and perl.  
 </p>
 
 </body>



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-doc-cvs] cvs commit: rsync.xml
@ 2005-11-07 11:47 Xavier Neys
  0 siblings, 0 replies; 16+ messages in thread
From: Xavier Neys @ 2005-11-07 11:47 UTC (permalink / raw
  To: gentoo-doc-cvs

neysx       05/11/07 11:47:06

  Modified:    xml/htdocs/doc/en rsync.xml
  Log:
  #111691 English improvements

Revision  Changes    Path
1.41      +11 -11    xml/htdocs/doc/en/rsync.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.41&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml?rev=1.41&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/rsync.xml.diff?r1=1.40&r2=1.41&cvsroot=gentoo

Index: rsync.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- rsync.xml	24 Apr 2005 09:21:50 -0000	1.40
+++ rsync.xml	7 Nov 2005 11:47:06 -0000	1.41
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding="UTF-8"?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.40 2005/04/24 09:21:50 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/rsync.xml,v 1.41 2005/11/07 11:47:06 neysx Exp $ -->
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
 <guide link="/doc/en/rsync.xml">
@@ -54,7 +54,7 @@
 them.  Otherwise, we can provide these services and you can simply ship the
 machine to our colocation facility.  Average bandwidth consumption for a main
 rotation mirror is currently ~7Mbps (around 2 TB per month).  As the number of
-main rotation mirrors increase, this number should decrease accordingly.
+main rotation mirrors increases, this number should decrease accordingly.
 </p>
 
 <p>
@@ -246,7 +246,7 @@
 
 <p>
 A: Because our resources are limited, we need to ensure we allocate them in
-such a way to provide the maximum amount of benefit to our users. As such, we
+such a way as to provide the maximum amount of benefit to our users. As such, we
 limit connections to our master rsync and distfile mirrors to public mirrors
 only. Users are welcome to use our regular mirror system to establish a private
 rsync mirror, though they are asked to follow certain basic
@@ -262,12 +262,12 @@
 
 <p>
 A: Yes it is important.  You do not need to perform the syncs at exactly :00 and :30
-but the syncs should take place between the following two windows:
+but the syncs should take place in each of the following two windows:
 </p>
 
 <ol>
-	<li>:00 and :10</li>
-	<li>:30 and :40</li>
+	<li>:00 to :10</li>
+	<li>:30 to :40</li>
 </ol>
 
 <p>
@@ -306,7 +306,7 @@
 </body>
 </section>
 <section>
-<title>Q: I'm seeing a lot of old and probably dead rsync processes, how can I get rid of that?</title>
+<title>Q: I'm seeing a lot of old and probably dead rsync processes, how can I get rid of them?</title>
 <body>
 
 <p>
@@ -439,7 +439,7 @@
 </p>
 
 <p>
-This command will help you killing old rsync processes that sometimes lies
+This command will help you to kill old rsync processes that sometimes lie
 around due to connection problems.  It's important to kill those because they
 count as valid connections for the 'max connections' option.  You may run this
 command via crontab every hour, it will search and kill rsync processes older
@@ -497,7 +497,7 @@
 rsync mirror and set it up. You should choose a computer that can handle the
 CPU and disk load that an rsync operation require. Your local mirror also needs
 to be available whenever any of your other computers syncs its portage tree.
-Besides, it should have a static IP address or a name that always resolve to
+Besides, it should have a static IP address or a name that always resolves to
 your server.  Configuring a DHCP and/or a DNS server is beyond the scope of
 this guide.
 </p>
@@ -574,7 +574,7 @@
 
 <note>
 Please note that most public mirror administrators consider syncing more than
-once or twice a day as an abuse.
+once or twice a day an abuse.
 </note>
 
 </body>
@@ -597,7 +597,7 @@
 </pre>
 
 <p>
-You can check that your computer has been properly set up and sync against your
+You can check that your computer has been properly set up by syncing against your
 own local mirror for the first time:
 </p>
 



-- 
gentoo-doc-cvs@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2007-12-27 17:22 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-12 11:21 [gentoo-doc-cvs] cvs commit: rsync.xml undefined
  -- strict thread matches above, loose matches on Subject: below --
2007-12-27 17:22 Shyam Mani
2006-12-25 18:53 Josh Saddler
2006-12-25 18:47 undefined
2006-07-20 15:09 Lukasz Damentko
2006-07-17 18:03 Lukasz Damentko
2006-06-04 19:40 undefined
2006-05-23 18:21 Jan Kundrat
2006-05-23 16:40 undefined
2006-05-12 20:07 Xavier Neys
2006-05-12 12:59 undefined
2005-12-12 16:04 Xavier Neys
2005-12-11 10:07 swift
2005-12-11  1:22 undefined
2005-11-07 11:54 Xavier Neys
2005-11-07 11:47 Xavier Neys

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox