Add links to backup rsync mirrors

3 files changed, 43 insertions, 13 deletions

diff --git a/site/download/index.php b/site/download/index.php
index 04b0a46..d21da16 100644
--- a/site/download/index.php
+++ b/site/download/index.php
@@ -81,7 +81,7 @@
 				</p>
 				<p>
 					You can verify the downloaded archives as follows:<br/>
-					$ <b>for signature in $(ls *.tar.xz.sig); do gpg --verify $signature; done</b>
+					$ <b>for signature in $(ls *.sig); do gpg --verify $signature; done</b>
 				</p>
 		
 		</div>
@@ -139,17 +139,45 @@
 
 				<h2 id="mirror">Mirroring <?php echo $lbProjectName; ?></h2>
 					<p>
-						Create a directory in your web server directory, eg <?php echo $lbProjectName; ?>/.<br/>
-						$ <b><?php echo $lbRsyncCommand; ?></b>
+						Create a directory in your web server document root (e.g. <?php echo $lbProjectName; ?>/),
+						and add one of these to your crontab:
 					</p>
+<?php
+
+	if (count($lbRsyncServer)>0) {
+?>
+					<h3>Main rsync mirror:</h3>
+						<p>
+							$ <b>rsync -avxP --delete --stats <?php echo $lbRsyncServer[0]; ?> /path/to/docroot/<?php echo $lbProjectName; ?>/</b>
+						</p>
+<?php
+		if(count($lbRsyncServer)>1) {
+?>
+					<h3>Backup rsync mirrors:</h3>
+						<p>
+<?php
+			for ($server=1; $server<count($lbRsyncServer); $server++) {
+?>
+							$ <b>rsync -avxP --delete --stats <?php echo $lbRsyncServer[$server]; ?> /path/to/docroot/<?php echo $lbProjectName; ?>/</b><br/>
+<?php
+			}
+?>
+						</p>
+<?php
+		}
+	} else {
+?>
 					<p>
-						Add this to your crontab.
+						<b>No mirrors available yet.</b>
 					</p>
+<?php
+	}
+?>
 
-				<p>
-					Are you running a mirror? Contact the <?php echo $lbProjectName; ?> project
-					(details are on the <a href="../">home page</a>), and the link will be added here.
-				</p>
+					<p>
+						Are you running a mirror? Contact the <?php echo $lbProjectName; ?> project
+						(details are on the <a href="../">home page</a>), and the link will be added here.
+					</p>
 	
 		</div>
 		
diff --git a/site/download/oldtorrent/index.php b/site/download/oldtorrent/index.php
index c4b5726..fb8e369 100644
--- a/site/download/oldtorrent/index.php
+++ b/site/download/oldtorrent/index.php
@@ -79,7 +79,7 @@
 				</p>
 				<p>
 					You can verify the downloaded archives as follows:<br/>
-					$ <b>for signature in $(ls *.tar.xz.sig); do gpg --verify $signature; done</b>
+					$ <b>for signature in $(ls *.sig); do gpg --verify $signature; done</b>
 				</p>
 		
 		</div>
diff --git a/site/variables.template.php b/site/variables.template.php
index b07f0c5..98bda0b 100644
--- a/site/variables.template.php
+++ b/site/variables.template.php
@@ -52,12 +52,14 @@
 		"http://www.libreboot.org/release/",
 		"https://freedombox.org/libreboot/",
 		"http://www.mirrorservice.org/sites/libreboot.org/release/",
-		"ftp://ftp.mirrorservice.org/sites/libreboot.org/release/",
-		"rsync://rsync.mirrorservice.org/libreboot.org/release/"
+		"ftp://ftp.mirrorservice.org/sites/libreboot.org/release/"
 	);
 	
-	/* rsync command (for mirroring the project) */
-	$lbRsyncCommand = "rsync -avxP --delete --stats libreboot.org::mirrormirror /path/to/webserver/directory/libreboot/";
+	/* rsync servers. Put the main one first */
+	$lbRsyncServer = array (
+		"libreboot.org::mirrormirror",
+		"rsync://rsync.mirrorservice.org/libreboot.org/release/"
+	);
 	
 	/* Bug tracker URL */
 	$lbBugTrackerAddress = "http://projects.mtjm.eu/projects/libreboot";