[gentoo-commits] sites/www:master commit in: support/rsync-mirrors/, downloads/mirrors/, _plugins/

[gentoo-commits] sites/www:master commit in: support/rsync-mirrors/, downloads/mirrors/, _plugins/

[Alex Legler]

commit:     1e59a8fc34822d74007827bec588fd6b55342e99
Author:     Alex Legler <alex <AT> a3li <DOT> li>
AuthorDate: Fri Jun 12 16:23:51 2015 +0000
Commit:     Alex Legler <a3li <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 16:23:51 2015 +0000
URL:        https://gitweb.gentoo.org/sites/www.git/commit/?id=1e59a8fc

Rework mirror information

 - Distfile -> Source mirror
 - Add rsync mirror page
 - Update usage docs

 _plugins/filters.rb                                |  5 +++
 downloads/mirrors/index.html                       | 23 ++++++++---
 .../mirrors => support/rsync-mirrors}/index.html   | 44 ++++++++++++----------
 3 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/_plugins/filters.rb b/_plugins/filters.rb
index 1a4f3c1..34ad123 100644
--- a/_plugins/filters.rb
+++ b/_plugins/filters.rb
@@ -17,6 +17,11 @@ module Gentoo
 
       "#{number} #{UNITS[exponent]}"
     end
+
+    def rsync_url(input)
+      input += '/' unless input.end_with? '/'
+      input + 'gentoo-portage/'
+    end
   end
 end
 

diff --git a/downloads/mirrors/index.html b/downloads/mirrors/index.html
index b680def..d042aed 100644
--- a/downloads/mirrors/index.html
+++ b/downloads/mirrors/index.html
@@ -1,5 +1,5 @@
 ---
-title: 'Gentoo Distfile Mirrors'
+title: 'Gentoo Source Mirrors'
 navtitle: 'Mirrors'
 nav1: downloads
 nav2: mirrors
@@ -12,18 +12,29 @@ nav2-show: true
 </p>
 
 <div class="alert alert-info">
-  <strong>Note</strong><br>
-  The mirrors listed on this page contain installation files such as LiveCDs, Portage snapshots as well as <em>distfiles</em> (the actual program code for most packages we offer).<br>
-  That means you can use them in your <code>GENTOO_MIRRORS</code> variable in <tt>make.conf</tt>, but they are <strong>not</strong> <em>rsync</em> mirrors (which go into <tt>repos.conf</tt>, formerly <code>SYNC</code> in <tt>make.conf</tt>).
+  <strong>Using Source Mirrors</strong>
+  <br>
+  The mirrors listed <strong>on this page</strong> contain installation files such as <strong>LiveCDs, Portage tree snapshots</strong>
+  as well as <strong>distfiles</strong> (the actual program code for our packages).
+  <br>
+  To use a source mirror for Portage downloads, add a URL from the list below to your <code>GENTOO_MIRRORS</code> variable in <tt>make.conf</tt>.
+  <a href="https://wiki.gentoo.org/wiki/GENTOO_MIRRORS" class="alert-link">More information</a> is available in our Wiki.
+</div>
+
+<div class="alert alert-success">
+  <strong>rsync Mirrors</strong>
+  <br>
+  We also have a second type of mirrors that you use for updating your Portage tree (configured via <tt>repos.conf</tt>).
+  They are available on a <a href="/support/rsync-mirrors/" class="alert-link">separate page</a>.
 </div>
 
 <p>
-  We would like to thank the many organizations and individuals that are providing mirroring services to the Gentoo project. If you would like to contribute a mirror, please consult the <a href="https://wiki.gentoo.org/wiki/Project:Infrastructure/Source_mirrors">relevant documentation</a>.
+  We would like to thank the many organizations and individuals that are providing mirroring services to the Gentoo project. If you would like to contribute a mirror, please consult the <a href="https://wiki.gentoo.org/wiki/Project:Infrastructure/Mirrors/Source">relevant documentation</a>.
 </p>
 
 <hr>
 
-<h2>Countries covered by Gentoo mirrors</h2>
+<h2>Countries covered by Gentoo Source Mirrors</h2>
 
 <table class="table table-condensed table-striped">
   <tr>

diff --git a/downloads/mirrors/index.html b/support/rsync-mirrors/index.html
similarity index 55%
copy from downloads/mirrors/index.html
copy to support/rsync-mirrors/index.html
index b680def..154e25c 100644
--- a/downloads/mirrors/index.html
+++ b/support/rsync-mirrors/index.html
@@ -1,36 +1,46 @@
 ---
-title: 'Gentoo Distfile Mirrors'
-navtitle: 'Mirrors'
-nav1: downloads
+title: 'Gentoo rsync Mirrors'
+navtitle: 'rsync Mirrors'
+nav1: support
 nav2: mirrors
 nav2-show: true
 ---
 
 <p>
-  Gentoo downloads can be retrieved from many mirrors around the globe.
-  Selecting a mirror that is geographically near you may help speed up downloads.
+  Gentoo is hosted by many mirrors around the globe.
+  Selecting a mirror that is geographically near you may help speed up Portage tree updates.
 </p>
 
 <div class="alert alert-info">
-  <strong>Note</strong><br>
-  The mirrors listed on this page contain installation files such as LiveCDs, Portage snapshots as well as <em>distfiles</em> (the actual program code for most packages we offer).<br>
-  That means you can use them in your <code>GENTOO_MIRRORS</code> variable in <tt>make.conf</tt>, but they are <strong>not</strong> <em>rsync</em> mirrors (which go into <tt>repos.conf</tt>, formerly <code>SYNC</code> in <tt>make.conf</tt>).
+  <strong>Using rsync Mirrors</strong>
+  <br>
+  The mirrors listed <strong>on this page</strong> are used for updating your Portage tree.
+  <br>
+  To use an rsync mirror, set the <tt>sync-uri</tt> variable in the <tt>[gentoo]</tt> section of <tt>repos.conf</tt> to a URL from the list below.
+  <a href="https://wiki.gentoo.org/wiki//etc/portage/repos.conf/gentoo.conf" class="alert-link">More information</a> is available in our Wiki.
+</div>
+
+<div class="alert alert-success">
+  <strong>Source Mirrors</strong>
+  <br>
+  We also have a second type of mirrors that you use for fetching installation files as well as package sources (configured via <code>GENTOO_MIRRORS</code>).
+  They are available on a <a href="/downloads/mirrors/" class="alert-link">separate page</a>.
 </div>
 
 <p>
-  We would like to thank the many organizations and individuals that are providing mirroring services to the Gentoo project. If you would like to contribute a mirror, please consult the <a href="https://wiki.gentoo.org/wiki/Project:Infrastructure/Source_mirrors">relevant documentation</a>.
+  We would like to thank the many organizations and individuals that are providing mirroring services to the Gentoo project. If you would like to contribute a mirror, please consult the <a href="https://wiki.gentoo.org/wiki/Project:Infrastructure/Mirrors/Rsync">relevant documentation</a>.
 </p>
 
 <hr>
 
-<h2>Countries covered by Gentoo mirrors</h2>
+<h2>Countries covered by Gentoo rsync Mirrors</h2>
 
 <table class="table table-condensed table-striped">
   <tr>
     <th>Region</th>
     <th>Countries</th>
   </tr>
-{% for region in site.data.mirrors.distfiles %}
+{% for region in site.data.mirrors.rsync %}
   <tr>
     <th>{{ region[0] }}</th>
     <td>
@@ -44,7 +54,7 @@ nav2-show: true
 
 <hr>
 
-{% for region in site.data.mirrors.distfiles %}
+{% for region in site.data.mirrors.rsync %}
   <h2>{{ region[0] }}</h2>
 
   {% for country in region[1] %}
@@ -52,19 +62,15 @@ nav2-show: true
 
     <table class="table table-condensed">
       <tr>
-        <th style="width: 30%;">Name</th>
-        <th style="width: 10%;">Protocol</th>
+        <th style="width: 55%;">Name</th>
         <th style="width: 10%;">IPv4/v6</th>
-        <th style="width: 50%;">URL</th>
+        <th style="width: 35%;">URL (for <tt>repos.conf</tt>)</th>
       </tr>
       {% for mirror in country[1].mirrors %}
         <tr>
           <td rowspan="{{ mirror.uris.size }}">{{ mirror.name }}</td>
           {% for uri in mirror.uris %}
             <td>
-              <span class="label label-primary">{{ uri.protocol }}</span>
-            </td>
-            <td>
               {% if uri.ipv4 == 'y' and uri.ipv6 == 'y' %}
                 <span class="label label-success">IPv4 + IPv6</span>
               {% elsif uri.ipv4 == 'y' %}
@@ -76,7 +82,7 @@ nav2-show: true
               {% endif %}
             </td>
             <td>
-              <a href="{{ uri.uri }}"><code>{{ uri.uri }}</code></a>
+              <a href="{{ uri.uri | rsync_url }}"><code>{{ uri.uri | rsync_url }}</code></a>
             </tr>
             <tr>
           {% endfor %}