From 62e20d7348ab7fbb980f765450bff595edde0ddd Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Wed, 3 Nov 2021 12:15:29 +0100
Subject: [PATCH] Force https usage in download URLs

See https://github.com/grml/grml-mirrors/issues/15
---
 download/mirrors/index.html.tt2 | 36 ++++++++++++++++--------------------
 gen_website                     |  4 ++--
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/download/mirrors/index.html.tt2 b/download/mirrors/index.html.tt2
index 5815b65..88546ef 100644
--- a/download/mirrors/index.html.tt2
+++ b/download/mirrors/index.html.tt2
@@ -29,32 +29,28 @@
 
             <p><strong>NOTE:</strong> Please visit the <a href="/download/">download webpage</a> if you don't need the full mirror list.</p>
 
-            <h2>Download via HTTP/FTP</h2>
+            <h2>Download via HTTPS/FTP</h2>
 
             <p><a href="http://en.wikipedia.org/wiki/Geo_targeting">GeoIP</a>
             (automatically try to figure out the best matching mirror):</p>
 
             <ul>
-              <li><a href="http://download.grml.org/">http://download.grml.org/</a></li>
+              <li><a href="https://download.grml.org/">https://download.grml.org/</a></li>
             </ul>
-	    [% FOREACH region IN mirrors.keys.sort %]
-	    	<h3>Mirrors in [% region.substr(3) %] </h3>
-
-		[% FOREACH mirror IN mirrors.$region.keys.sort %]
-		<p>[% mirror %] ([% mirrors.$region.$mirror.location %])</p>
-		[% FOREACH type IN [ 'grml-http' 'grml-rsync' 'grml-ftp' ] %]
-        [% NEXT UNLESS mirrors.$region.$mirror.$type %]
-		<ul>
-            <li><a href="[% type.substr(5) %]://[% mirror %]/[% mirrors.$region.$mirror.$type %]">
-                [% type.substr(5) %]://[% mirror %]/[% mirrors.$region.$mirror.$type %]
-                </a>
-            </li>
-		</ul>
-		[% END %]
-		[% END %]
-	    [% END %]
-
-
+            [% FOREACH region IN mirrors.keys.sort %]
+                <h3>Mirrors in [% region.substr(3) %] </h3>
+
+                [% FOREACH mirror IN mirrors.$region.keys.sort %]
+                <p>[% mirror %] ([% mirrors.$region.$mirror.location %])</p>
+                [% FOREACH type IN [ 'grml-http' 'grml-rsync' 'grml-ftp' ] %]
+                [% NEXT UNLESS mirrors.$region.$mirror.$type %]
+                <ul>
+                  <li><a href="[% type.substr(5) %]://[% mirror %]/[% mirrors.$region.$mirror.$type %]">
+                  [% type.substr(5) %]://[% mirror %]/[% mirrors.$region.$mirror.$type %]</a></li>
+                </ul>
+                [% END %]
+                [% END %]
+            [% END %]
 
             <hr />
 
diff --git a/gen_website b/gen_website
index 12a4e1f..7c26751 100755
--- a/gen_website
+++ b/gen_website
@@ -52,7 +52,7 @@ while (($have_mirmon) && (my $line = <$fh>)) {
         my $value = $2;
         $data->{$key} = $value;
     } elsif ($line eq '') {
-	my $url = sprintf ("http://%s%s", $data->{'site'}, $data->{'grml-http'});
+	my $url = sprintf ("https://%s%s", $data->{'site'}, $data->{'grml-http'});
        	next if get_last_state($url) eq 'f';
 	$mirrors->{ $data->{'country'} }->{ $data->{'site'} } = $data;
         $data = undef;
@@ -62,7 +62,7 @@ while (($have_mirmon) && (my $line = <$fh>)) {
 }
 
 if ($data) {
-	my $url = sprintf ("http://%s%s", $data->{'site'}, $data->{'grml-http'});
+	my $url = sprintf ("https://%s%s", $data->{'site'}, $data->{'grml-http'});
 	$mirrors->{ $data->{'country'} }->{ $data->{'site'} } = $data if get_last_state($url) eq 'f';
 }
 
-- 
2.1.4