files: include usage of signed-by=/usr/share/keyrings/grml-archive-keyring.gpg

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

diff --git a/files/index.html.tt2 b/files/index.html.tt2
index 94818a0..bb1e75d 100644 (file)
--- 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>
 
@@ -65,10 +65,10 @@ 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>
+       <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 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>
@@ -89,7 +89,7 @@ sudo apt-get install grml-debian-keyring
         <ul>
           <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="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="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>
 
@@ -98,7 +98,7 @@ sudo apt-get install grml-debian-keyring
         <ul>
           <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="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="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>
 
@@ -107,7 +107,7 @@ sudo apt-get install grml-debian-keyring
         <ul>
           <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="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="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 2018.12</h3>
@@ -115,7 +115,7 @@ sudo apt-get install grml-debian-keyring
         <ul>
           <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="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="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>