pull archive keyring out of global trust path

[grml.org.git] / files / index.html.tt2

diff --git a/files/index.html.tt2 b/files/index.html.tt2
index 51574ba..cf9ecde 100644 (file)
--- a/files/index.html.tt2
+++ b/files/index.html.tt2
@@ -52,7 +52,7 @@ 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>
        
@@ -68,7 +68,7 @@ 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 /etc/apt/trusted.gpg.d/grml.gpg http://deb.grml.org/repo-key.gpg
+sudo wget -O /usr/share/keyrings/grml-archive-keyring.gpg http://deb.grml.org/repo-key.gpg
 sudo apt-get update
 sudo apt-get install grml-debian-keyring
 </pre>
@@ -84,40 +84,40 @@ 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 2017.05</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="grml32-full_2017.05/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml32-full_2017.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_2014.11/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
+          <li><a href="grml32-full_2017.05/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 2017.05</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="grml64-full_2017.05/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml64-full_2017.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_2014.11/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
+          <li><a href="grml64-full_2017.05/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 2017.05</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="grml32-small_2017.05/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml32-small_2017.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_2014.11/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
+          <li><a href="grml32-small_2017.05/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
         </ul>
 
-        <h3>grml64-small 2014.11</h3>
+        <h3>grml64-small 2017.05</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="grml64-small_2017.05/dpkg.selections">dpkg.selections</a> - software package listing</li>
+          <li><a href="grml64-small_2017.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_2014.11/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
+          <li><a href="grml64-small_2017.05/nonfree-licenses.txt">nonfree-licenses.txt</a> - a list of used nonfree software and their licenses</li>
         </ul>
 
       </div>