prioritise HTTPS mirrors on the download page

2 files changed, 22 insertions, 7 deletions

diff --git a/site/common/variables.php b/site/common/variables.php
index 8172159..3842dbd 100644
--- a/site/common/variables.php
+++ b/site/common/variables.php
@@ -38,19 +38,21 @@
 	);
 
 	/* HTTP mirrors (for release archives) */
-	$lbHttpMirror = array(
-		array("http://mirrors.mit.edu/libreboot/","MIT, USA"),
+	$lbHttpsMirror = array(
+		array("https://ginette.swordarmor.fr/libreboot/","swordarmor.fr, France"),
+		array("https://mirror.se.partyvan.eu/pub/libreboot/","partyvan.eu, Sweden"),
+        array("https://mirror.gnu.dk/libreboot/", "GNU.dk, Denmark")
+    );
+    $lbHttpMirror = array(
+        array("http://mirrors.mit.edu/libreboot/","MIT, USA"),
 		array("http://www.mirrorservice.org/sites/libreboot.org/release/","University of Kent, UK"),
 		array("http://tpvj6abq225m5pcf.onion/pub/libreboot/","Tor hidden server, Undisclosed location"),
 		array("http://elgrande74.net/libreboot/","elgrande74.net, France"),
 		array("http://mirror.linux.ro/libreboot/","linux.ro, Romania"),
-		array("https://ginette.swordarmor.fr/libreboot/","swordarmor.fr, France"),
-		array("http://ginette.swordarmor.fr/libreboot/","swordarmor.fr, France"),
+ 		array("http://ginette.swordarmor.fr/libreboot/","swordarmor.fr, France"),
 		array("http://mirror.helium.in-berlin.de/libreboot/","in-berlin.de, Germany"),
-		array("https://mirror.se.partyvan.eu/pub/libreboot/","partyvan.eu, Sweden"),
-        array("https://mirror.gnu.dk/libreboot/", "GNU.dk, Denmark"),
         array("http://libreboot.mirror.si/","mirror.si, Slovenia")
-);
+    );
 	/* FTP mirrors (for release archives) */
 	$lbFtpMirror = array(
 		array("ftp://ftp.mirrorservice.org/sites/libreboot.org/release/","University of Kent, UK"),
diff --git a/site/download/index.php b/site/download/index.php
index 2166ebf..aa409ce 100644
--- a/site/download/index.php
+++ b/site/download/index.php
@@ -49,7 +49,20 @@
 				also includes links to the Git repositories.
 			</p>
 
+            <h2 id="https">HTTPS mirrors</h2>
+                <p>
+                    These mirrors are recommended, since they use TLS (https://) encryption.
+                </p>
+<?php
+                echo mirrorList($lbHttpsMirror, gettext("HTTPS mirrors not added yet."),0,count($lbHttpsMirror));
+?>
 			<h2 id="http">HTTP mirrors</h2>
+                <p>
+                    WARNING: these mirrors are non-HTTPS which means that they are unencrypted. Your traffic could be subject
+                    to interference by adversaries. Make especially sure to check the GPG signatures, assuming
+                    that you have the right key. Of course, you should do this anyway, even if
+                    using HTTP.
+                </p>
 <?php
 				/* show HTTP mirrors */
 				echo mirrorList($lbHttpMirror, gettext("HTTP mirrors not added yet."),0,count($lbHttpMirror));