X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=files%2Findex.html.tt2;h=bb1e75d21b4b9ed7c8bfbd94646ae63d5b2c2bf3;hb=ff7260455a685fa8f21eba93b1af4fb964454e20;hp=40b41c4402dfae68fe994e660eddc36f27a74df1;hpb=52725265980c26a814e88fd7374b5175c979516c;p=grml.org.git

diff --git a/files/index.html.tt2 b/files/index.html.tt2
index 40b41c4..bb1e75d 100644
--- a/files/index.html.tt2
+++ b/files/index.html.tt2
@@ -33,16 +33,16 @@
 
         <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-debian-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>
+#  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>
 
@@ -52,23 +52,23 @@ URIs: http://deb.grml.org/
 Suites: grml-stable grml-testing
 Architectures: i386 amd64
 Components: main
-Signed-By: 05483D2F0A254E5BC12AC73021E0CA38EA2EA4AB</pre>
+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 suite=grml-stable
-Pin-Priority: 1
+Pin: release a=grml-stable
+Pin-Priority: 100
 
 Package: *
-Pin: release suite=grml-testing
-Pin-Priority: 1</pre>
+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>
+	<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 /etc/apt/trusted.gpg.d/grml.gpg http://deb.grml.org/repo-key.gpg
+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>
@@ -84,40 +84,38 @@ sudo apt-get install grml-debian-keyring
 
         <h2><a name="debian"></a>Package lists for the current release</h2>
 
-        <h3>grml32-full 2014.11</h3>
+        <h3>grml32-full 2018.12</h3>
 
         <ul>
-          <li><a href="grml32-full_2014.11/dpkg.selections">dpkg.selections</a> - software package listing</li>
-          <li><a href="grml32-full_2014.11/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_2014.11/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
+          <li><a href="grml32-full_2018.12/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml32-full_2018.12/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_2018.12/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
         </ul>
 
-        <h3>grml64-full 2014.11</h3>
+        <h3>grml64-full 2018.12</h3>
 
         <ul>
-          <li><a href="grml64-full_2014.11/dpkg.selections">dpkg.selections</a> - software package listing</li>
-          <li><a href="grml64-full_2014.11/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_2014.11/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
+          <li><a href="grml64-full_2018.12/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml64-full_2018.12/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_2018.12/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
         </ul>
 
-        <h3>grml32-small 2014.11</h3>
+        <h3>grml32-small 2018.12</h3>
 
         <ul>
-          <li><a href="grml32-small_2014.11/dpkg.selections">dpkg.selections</a> - software package listing</li>
-          <li><a href="grml32-small_2014.11/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_2014.11/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
+          <li><a href="grml32-small_2018.12/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml32-small_2018.12/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 2014.11</h3>
+        <h3>grml64-small 2018.12</h3>
 
         <ul>
-          <li><a href="grml64-small_2014.11/dpkg.selections">dpkg.selections</a> - software package listing</li>
-          <li><a href="grml64-small_2014.11/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_2014.11/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
+          <li><a href="grml64-small_2018.12/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml64-small_2018.12/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>