X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=files%2Findex.html.tt2;h=c8183525238919409f0afa0f6f1c481049a5ce4c;hb=c6fcf46ec9905b036669bcc871bab1111159b301;hp=e5140e51bbb57992e1799c0ce62b6d52c15f6bf0;hpb=b6a295abac77754da3751a0499f053ec725c1937;p=grml.org.git

diff --git a/files/index.html.tt2 b/files/index.html.tt2
index e5140e5..c818352 100644
--- a/files/index.html.tt2
+++ b/files/index.html.tt2
@@ -7,10 +7,9 @@
 <meta name="Keywords" content="grml.org, grml" />
 <meta name="Description" content="Files of grml.org" />
 <meta name="Abstract" content="grml, just another linux-distribution" />
-<meta name="fdse-index-as" content="http://www.grml.org/files/" />
 <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" />
@@ -33,16 +32,45 @@
 
         <p>Packages provided by the Grml team are
         available from the <a
-        href="http://deb.grml.org/">Grml repository</a>.</p>
+        href="https://deb.grml.org/">Grml repository</a>.</p>
 
-	<p>Note that using the Grml repository on standard Debian systems is <b>not recommended</b>. If you just want our console configuration, read <a href="http://grml.org/console/">"Make console work comfortable"</a>.</p>
+	<p>Note that using the Grml repository on standard Debian systems is <b>not recommended</b>. If you just want our console configuration, read <a href="/console/">"Make console work comfortable"</a>.</p>
 
 	<pre class="rahmen">
-# Signing key is available in grml-archive-keyring
-#  deb     http://deb.grml.org/ grml-stable main
-#  deb-src http://deb.grml.org/ grml-stable main
-#  deb     http://deb.grml.org/ grml-testing main
-#  deb-src http://deb.grml.org/ grml-testing main</pre>
+# Signing key is available in grml-debian-keyring
+#  deb     [signed-by=/usr/share/keyrings/grml-archive-keyring.gpg] http://deb.grml.org/ grml-stable main
+#  deb-src [signed-by=/usr/share/keyrings/grml-archive-keyring.gpg] http://deb.grml.org/ grml-stable main
+#  deb     [signed-by=/usr/share/keyrings/grml-archive-keyring.gpg] http://deb.grml.org/ grml-testing main
+#  deb-src [signed-by=/usr/share/keyrings/grml-archive-keyring.gpg] http://deb.grml.org/ grml-testing main</pre>
+
+	<p>If you are running Debian stretch or later, you may want to use the following <code>.sources</code> file, which will enforce the suite name and signing keys:</p>
+
+	<pre class="rahmen">
+Types: deb deb-src
+URIs: http://deb.grml.org/
+Suites: grml-stable grml-testing
+Architectures: i386 amd64
+Components: main
+Signed-By: /usr/share/keyrings/grml-archive-keyring.gpg</pre>
+
+	<p>Then the following <a href="https://manpages.debian.org/apt_preferences">preferences file</a> will keep packages from GRML to replace normal Debian packages, in <code>/etc/apt/preferences.d/grml.pref</code>:</p>
+
+	<pre class="rahmen">
+Package: *
+Pin: release a=grml-stable
+Pin-Priority: 100
+
+Package: *
+Pin: release a=grml-testing
+Pin-Priority: 100</pre>
+
+	<p>Also note that you may have trouble installing the <code>grml-debian-keyring</code> package as APT will complain about the missing key. A workaround is to download it directly:</p>
+
+	<pre class="rahmen">
+sudo wget -O /usr/share/keyrings/grml-archive-keyring.gpg https://deb.grml.org/repo-key.gpg
+sudo apt-get update
+sudo apt-get install grml-debian-keyring
+</pre>
 
         <h2><a name="wallpapers"></a>Wallpapers and other media files provided by Grml</h2>
 
@@ -51,40 +79,42 @@
 
         <h2><a name="changelog"></a>Changelogs</h2>
 
-        <p>The changelogs have moved to <a href="/changelogs/">their own webpage</a>.</p>
+        <p>The changelogs moved to <a href="/changelogs/">their own webpage</a>.</p>
 
         <h2><a name="debian"></a>Package lists for the current release</h2>
 
-        <h3>grml32-full 2012.05</h3>
+        <h3>grml32-full 2021.07</h3>
 
         <ul>
-          <li><a href="grml32-full_2012.05/dpkg.selections">dpkg.selections</a> - software package listing</li>
-          <li><a href="grml32-full_2012.05/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
-          <li><a href="http://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">grml-cheatcodes.txt</a> - boot options</li>
+          <li><a href="grml32-full_2021.07/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml32-full_2021.07/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
+          <li><a href="https://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">grml-cheatcodes.txt</a> - boot options</li>
+          <li><a href="grml32-full_2021.07/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
         </ul>
 
-        <h3>grml64-full 2012.05</h3>
+        <h3>grml64-full 2021.07</h3>
 
         <ul>
-          <li><a href="grml64-full_2012.05/dpkg.selections">dpkg.selections</a> - software package listing</li>
-          <li><a href="grml64-full_2012.05/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
-          <li><a href="http://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">grml-cheatcodes.txt</a> - boot options</li>
+          <li><a href="grml64-full_2021.07/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml64-full_2021.07/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
+          <li><a href="https://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">grml-cheatcodes.txt</a> - boot options</li>
+          <li><a href="grml64-full_2021.07/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
         </ul>
 
-        <h3>grml32-small 2012.05</h3>
+        <h3>grml32-small 2021.07</h3>
 
         <ul>
-          <li><a href="grml32-small_2012.05/dpkg.selections">dpkg.selections</a> - software package listing</li>
-          <li><a href="grml32-small_2012.05/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
-          <li><a href="http://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">grml-cheatcodes.txt</a> - boot options</li>
+          <li><a href="grml32-small_2021.07/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml32-small_2021.07/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
+          <li><a href="https://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">grml-cheatcodes.txt</a> - boot options</li>
         </ul>
 
-        <h3>grml64-small 2012.05</h3>
+        <h3>grml64-small 2021.07</h3>
 
         <ul>
-          <li><a href="grml64-small_2012.05/dpkg.selections">dpkg.selections</a> - software package listing</li>
-          <li><a href="grml64-small_2012.05/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
-          <li><a href="http://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">grml-cheatcodes.txt</a> - boot options</li>
+          <li><a href="grml64-small_2021.07/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml64-small_2021.07/dpkg.list">dpkg.list</a> - more detailed package list including version information</li>
+          <li><a href="https://git.grml.org/?p=grml-live.git;a=blob_plain;f=templates/GRML/grml-cheatcodes.txt;hb=HEAD">grml-cheatcodes.txt</a> - boot options</li>
         </ul>
 
       </div>