X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=download%2Findex.html.tt2;h=09015a169b52e6ede69ec0acea084e29bfdd6f1a;hb=88b6d337c3673f0625875d24dc711e67728b0f91;hp=17da6cab08fe98c6135c7404a74f7809234ca066;hpb=45240c0f1fceb3c765ee8eef77d495cd08b7d9a1;p=grml.org.git

diff --git a/download/index.html.tt2 b/download/index.html.tt2
index 17da6ca..09015a1 100644
--- a/download/index.html.tt2
+++ b/download/index.html.tt2
@@ -7,10 +7,9 @@
 <meta name="Keywords" content="grml.org, grml" />
 <meta name="Description" content="Download of grml.org" />
 <meta name="Abstract" content="grml, just another linux-distribution" />
-<meta name="fdse-index-as" content="http://www.grml.org/download/" />
 <meta name="Robots" content="index,follow" />
 <meta name="Language" content="english" />
-<meta name="identifier-url" content="http://www.grml.org/" />
+<meta name="identifier-url" content="https://grml.org/" />
 <meta name="MSSmartTagsPreventParsing" content="true" />
 <meta http-equiv="imagetoolbar" content="no" />
 <link rel="home" href="/" title="grml.org" />
@@ -77,7 +76,7 @@
 
 <div class="content">
 
-    <h1>Download Grml 2017.05</h1>
+    <h1>Download Grml 2020.06</h1>
 
     <p>Get the current stable release here.<br />
 
@@ -89,35 +88,35 @@
 
     <div class="download_group" id="download_group1_noscript">
     <div class="download_panel" id="download_panel1_noscript"><div>
-        <a href="http://grml.org/download/mirrors/">Download from a specific mirror</a><br/>
+        <a href="https://grml.org/download/mirrors/">Download from a specific mirror</a><br/>
         <br/>
         Direct download links:<br/>
-        <a href="http://download.grml.org/grml96-full_2017.05.iso">Grml96 full ISO</a> [<a href="http://download.grml.org/grml96-full_2017.05.iso.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml64-full_2017.05.iso">Grml64 full ISO</a> [<a href="http://download.grml.org/grml64-full_2017.05.iso.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml32-full_2017.05.iso">Grml32 full ISO</a> [<a href="http://download.grml.org/grml32-full_2017.05.iso.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml96-small_2017.05.iso">Grml96 small ISO</a> [<a href="http://download.grml.org/grml96-small_2017.05.iso.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml64-small_2017.05.iso">Grml64 small ISO</a> [<a href="http://download.grml.org/grml64-small_2017.05.iso.asc">Signature</a>]<br/>
-        <a href="http://download.grml.org/grml32-small_2017.05.iso">Grml32 small ISO</a> [<a href="http://download.grml.org/grml32-small_2017.05.iso.asc">Signature</a>]<br/>
+        <a href="https://download.grml.org/grml96-full_2020.06.iso">Grml96 full ISO</a> [<a href="https://download.grml.org/grml96-full_2020.06.iso.sha1.asc">Signature</a>]<br/>
+        <a href="https://download.grml.org/grml64-full_2020.06.iso">Grml64 full ISO</a> [<a href="https://download.grml.org/grml64-full_2020.06.iso.sha1.asc">Signature</a>]<br/>
+        <a href="https://download.grml.org/grml32-full_2020.06.iso">Grml32 full ISO</a> [<a href="https://download.grml.org/grml32-full_2020.06.iso.sha1.asc">Signature</a>]<br/>
+        <a href="https://download.grml.org/grml96-small_2020.06.iso">Grml96 small ISO</a> [<a href="https://download.grml.org/grml96-small_2020.06.iso.sha1.asc">Signature</a>]<br/>
+        <a href="https://download.grml.org/grml64-small_2020.06.iso">Grml64 small ISO</a> [<a href="https://download.grml.org/grml64-small_2020.06.iso.sha1.asc">Signature</a>]<br/>
+        <a href="https://download.grml.org/grml32-small_2020.06.iso">Grml32 small ISO</a> [<a href="https://download.grml.org/grml32-small_2020.06.iso.sha1.asc">Signature</a>]<br/>
         <br/>
         </div></div>
     </div>
 
     <div class="download_group" id="download_group1" style="display:none;">
     <form method="get" action="/download/bounce/">
-    <input type="hidden" name="version" value="2017.05"/>
+    <input type="hidden" name="version" value="2020.06"/>
     <div class="download_panel" id="download_panel1"><div>
 
     <h2>Options</h2>
 
     <select name="flavour" id="download_flavour" style="width:100%;">
-    <option value="full" selected="selected">grml-full (~600MB)</option>
-    <option value="small">grml-small (~280MB)</option>
+    <option value="full" selected="selected">grml-full (~750MB)</option>
+    <option value="small">grml-small (~350MB)</option>
     </select>
     <br /><br />
     <select name="arch" id="download_arch" style="width:100%;">
     <option value="amd64" selected="selected">64-bit PC (amd64)</option>
-    <option value="i386">32-bit PC (i586+)</option>
-    <option value="96">One for both (~1.2GB)</option>
+    <option value="i386">32-bit PC (i686+)</option>
+    <option value="96">One for both (~1.4GB)</option>
     </select>
     <br />
     <br />
@@ -126,34 +125,34 @@
     <br />
 
     <!--
-    <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Get 2014.10-rc1 instead!</span></a>
+    <a href="/download/prerelease/" class="button" style="padding: 12px; font-weight: bold;"><span>Get 2020.06-rc1 instead!</span></a>
     <br />
     <br />
     <br />
     -->
 
+
     <div style="font-size: 14pt;">
-    <p><a href="http://grml.org/changelogs/README-grml-2017.05">Release Notes</a></p>
+    <p><a href="/changelogs/README-grml-2020.06">Release Notes</a></p>
 
     </div>
     </div>
     </div>
 
-
     <div class="download_panel" id="download_panel2"><div>
     <!-- fallback cgi buttons -->
     <div id="formbuttons">
     <button name="filetype" value="iso" id="download_button_mirror" class="largebutton" style="width:100%;" type="submit">Download Now </button><br />
     <button name="filetype" value="bt" id="download_button_bt" type="submit">Download using BitTorrent</button><br />
     <button name="filetype" value="signature" id="download_button_signature" type="submit">Get Checksum/Signature</button><br />
-    <a href="http://grml.org/download/mirrors/">Download from a specific mirror</a><br/>
+    <a href="https://grml.org/download/mirrors/">Download from a specific mirror</a><br/>
     </div>
     <!-- JS links -->
     <div id="linkbuttons" style="display:none;">
     <a id="download_link_mirror" class="largebutton">Download Now</a><br />
     <a id="download_link_bt">BitTorrent Download</a><br />
     <a id="download_link_signature">Get Checksum/Signature</a><br />
-    <a href="http://grml.org/download/mirrors/">Download from a specific mirror</a><br/>
+    <a href="https://grml.org/download/mirrors/">Download from a specific mirror</a><br/>
     </div>
     </div></div>
 
@@ -161,13 +160,13 @@
     <script type="text/javascript">
     function update_arch() {
         var flavour = document.getElementById('download_flavour').value;
-        if (flavour == 'small') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i586+)</option><option value="96">One for both (~550MB)</option>';
-        if (flavour == 'full') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i586+)</option><option value="96">One for both (~1.2GB)</option>';
+        if (flavour == 'small') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i686+)</option><option value="96">One for both (~670MB)</option>';
+        if (flavour == 'full') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i686+)</option><option value="96">One for both (~1.4GB)</option>';
         update_links();
     }
 
     function update_links() {
-        var current_version = "2017.05";
+        var current_version = "2020.06";
         var product = 'grml';
         var arch = document.getElementById('download_arch').value;
         var flavour = document.getElementById('download_flavour').value;
@@ -175,11 +174,11 @@
         if (arch == 'i386') product = 'grml32';
         if (arch == '96') product = 'grml96';
         var iso = product + '-' + flavour + '_' + current_version + '.iso';
-        var mirror_url = "http://download.grml.org/";
+        var mirror_url = "https://download.grml.org/";
         document.getElementById('download_link_mirror').href = mirror_url + iso;
         document.getElementById('download_link_mirror').innerHTML = '<br />Download Now<div class="download_relinfo">' + product + '-' + flavour + ' ' + current_version + '</div>';
         document.getElementById('download_link_bt').href = mirror_url + iso + '.torrent';
-        document.getElementById('download_link_signature').href = mirror_url + iso + '.asc';
+        document.getElementById('download_link_signature').href = mirror_url + iso + '.sha1.asc';
     }
 
     // hook update function
@@ -199,15 +198,15 @@
 
     <div class="download_panel" id="download_panel3"><div>
     <b>Alternate downloads</b><br /><br />
-    <a href="http://daily.grml.org/">Daily images</a><br />
-    <a href="http://download.grml.org/">Older releases</a><br />
-    <a href="http://download.grml.org/grml_sources-2017.05.tar.gz">Source code</a> (both archs)<br />
+    <a href="https://daily.grml.org/">Daily images</a><br />
+    <a href="https://download.grml.org/">Older releases</a><br />
+    <a href="https://download.grml.org/grml_sources-2020.06.tar.gz">Source code</a> (one tgz for both archs)<br />
     <br/>
     Netboot packages:<br/>
-    <a href="http://download.grml.org/grml_netboot_package_grml64-full_2017.05.tar.bz2">64-bit</a>
-    <a href="http://download.grml.org/grml_netboot_package_grml64-full_2017.05.tar.bz2.asc">(sig)</a>
-    <a href="http://download.grml.org/grml_netboot_package_grml32-full_2017.05.tar.bz2">32-bit</a>
-    <a href="http://download.grml.org/grml_netboot_package_grml32-full_2017.05.tar.bz2.asc">(sig)</a>
+    <a href="https://download.grml.org/grml_netboot_package_grml64-full_2020.06.tar.bz2">64-bit</a>
+    <a href="https://download.grml.org/grml_netboot_package_grml64-full_2020.06.tar.bz2.sha1.asc">(signed sig)</a>
+    <a href="https://download.grml.org/grml_netboot_package_grml32-full_2020.06.tar.bz2">32-bit</a>
+    <a href="https://download.grml.org/grml_netboot_package_grml32-full_2020.06.tar.bz2.sha1.asc">(signed sig)</a>
 
     <br />
     <br />
@@ -217,20 +216,21 @@
     <br />
     For each released ISO image there is also a signature file, that should be verified with the following
     <a href="https://grml.org/download/gnupg-michael-prokop.txt">signing key</a>:
-    <pre>pub  4096R/96A87872B7EA3737 2010-07-14 Michael Prokop &lt;mail (at) michael-prokop.at&gt;
-Key fingerprint = 33CC B136 401A FEC8 43A3  8763 96A8 7872 B7EA 3737
-sub  4096R/257B6FD52892CF7E 2010-07-14</pre>
+    <pre>pub  4096R/96A87872B7EA3737 2010-07-14 Michael Prokop &lt;mika (at) grml.org&gt;
+Key  fingerprint = 33CC B136 401A FEC8 43A3  8763 96A8 7872 B7EA 3737
+sub  rsa4096/257B6FD52892CF7E 2010-07-14 [E]
+sub  rsa4096/43A1FB9BCC87C963 2018-07-26 [A] [expires: 2022-05-20]</pre>
     </div></div>
 
     <div class="download_panel" id="download_panel4"><div>
     <b>Boot from USB key</b><br />
     <br />
     Just <tt>dd(1)</tt> the downloaded ISO to an <abbr title="Any existing data will be overwritten by the dd command!">empty</abbr> USB key!<br /><br />
-    <code>dd if=grml64_2017.05.iso of=/dev/USB_KEY</code>
+    <code>dd if=grml64_2020.06.iso of=/dev/USB_KEY</code>
     <br /><br />
 
     <b>Troubleshooting</b><br /><br />
-    <a href="http://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">Boot option guide</a>
+    <a href="https://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">Boot option guide</a>
     <br /><br />
 
     </div></div>
@@ -239,7 +239,7 @@ sub  4096R/257B6FD52892CF7E 2010-07-14</pre>
 
     <h2>Git repositories</h2>
 
-    <p>The Grml team uses <a href="http://git-scm.com/">git</a> for
+    <p>The Grml team uses <a href="https://git-scm.com/">git</a> for
     managing software and packages. The repositories are available
     online at <a href="https://github.com/grml/">GitHub</a>.</p>