web/html/about/security index.php,1.1.1.1,1.2

[Karsten Wade (kwade)]

Author: kwade

Update of /cvs/fedora/web/html/about/security
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15400/web/html/about/security

Modified Files:
	index.php 
Log Message:
Applying patch from bz#189069


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/about/security/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- index.php	30 Mar 2005 17:47:22 -0000	1.1.1.1
+++ index.php	13 Oct 2006 17:20:11 -0000	1.2
@@ -1,101 +1,11 @@
-<?
+<?php
+//
+// Easily-changeable template for redirection.
+//
 
-include("site.inc");
-$template = new Page;
-$template->initCommon(); 
-$template->displayHeader();
+//$NEWURL="http://fedora.redhat.com/About/security/";
+$NEWURL="http://fedoraproject.org/wiki/Security";
 
-?>
-
-<h1>GPG Keys</h1>
-
-<p><? print $THE_PROJECT_NAME; ?> uses a number of GNU Privacy Guard (GPG)
-keys to communicate securely. This document is designed to tell you
-which keys we use for which purposes and how to verify those keys.</p>
-
-<p>It is a good security practice to validate public keys that you receive and
-to only trust validated keys. Therefore before trusting Red Hat public keys
-you should attempt to validate the fingerprints from a number of sources,
-and not rely solely on this page as being authentic.</p>
-
-<p>Public key validation, verification, and trust models are complicated
-subjects. For further details consult the GPG documentation.</p>
-
-<p>To verify an RPM package, run the command:</p>
-
-<code class="screen">
-rpm --checksig -v <filename>.rpm
-</code>
-
-<p>The output of this command will show you if the package is signed
-and who signed it.</p>
-
-<h2>Package Signing</h2>
-
-<p>Software packages distributed as part of the <? print $THE_PROJECT_NAME; ?> 
-are signed with the fedora at redhat.com public key.</p>
-
-<p><? print $THE_PROJECT_NAME; ?> fedora at redhat.com public key is available
-from a number of places:</p>
-
-<ul>
-  <li>From <A HREF="4F2A6FD2.txt">our website</A></li>
-  <li>In a <? print $RELEASE_NAME; ?> distribution, in the file <code class="filename">/usr/share/rhn/RPM-GPG-KEY-fedora</code>
-  <li>On a public keyserver, such as
-    <A HREF="http://pgp.mit.edu:11371/pks/lookup?search=0x4f2a6fd2&op=index">pgp.mit.edu</A></li>
-</ul>
-
-<p>The fingerprint of the fedora at redhat.com key is:</p>
-<pre>
-CAB4 4B99 6F27 744E 8612  7CDF B442 69D0 4F2A 6FD2
-</pre>
-
-<h2>Test Package Signing</h2>
-
-<p>From time to time, <? print $THE_PROJECT_NAME; ?> makes test software
-available. This software may be signed using the <? print $PROJECT_NAME; ?> 
-test software key, id 0x30C9ECF8.</p>
-
-<p><? print $THE_PROJECT_NAME; ?> test software public key is available
-from the following locations:</p>
-
-<ul>
-  <li>From <A HREF="30C9ECF8.txt">our website</A></li>
-  <li>In a <? print $RELEASE_NAME; ?> distribution, in the file <code class="filename">/usr/share/rhn/RPM-GPG-KEY-fedora-test</code>
-  <li>On a public keyserver, such as
-    <A HREF="http://pgp.mit.edu:11371/pks/lookup?search=0x30c9ecf8&op=index">pgp.mit.edu</A></li>
-</ul>
-
-<p>The fingerprint of the <? print $PROJECT_NAME; ?> test software key is:</p>
-<pre>
-3166 C14A AE72 30D9 3B7A  B2F6 DA84 CBD4 30C9 ECF8
-</pre>
-
-<h2>Automated Package Signing</h2>
-
-<p>From time to time, <? print $THE_PROJECT_NAME; ?> makes development software
-available. This software may be signed by an automated build signing key.
-Because this key is used automatically, we expect to change the key we sign
-with from time to time.</p>
-
-<p>The current <? print $PROJECT_NAME; ?> automated build signing public
-key, has key id 0x1CDDBCA9 and is available from a number of places:</p>
-
-<ul>
-  <li>From <A HREF="1CDDBCA9.txt">our website</A></li>
-  <li>On a public keyserver, such as
-    <A HREF="http://pgp.mit.edu:11371/pks/lookup?search=0x1cddbca9&op=index">pgp.mit.edu</A></li>
-</ul>
-
-<p>The fingerprint of the <? print $PROJECT_NAME; ?> automated
-build signing key is:</p>
-<pre>
-2312 6DEE 2014 B8A7 6CD6  D32C E138 5D4E 1CDD BCA9
-</pre>
-
-<?
-
-$template->displayFooter('$Date$');
+include("redirect.inc");
 
 ?>
-