Update Security Guide Links

Redirect old contents to new index.html since most pages have different
names.
Update links to Guide.
Remove links to PDF since we do not publish a PDF for RST guides.
Mention that Lulu copy is outdated.

Change-Id: I32de4f11c42be0d8c1abc4baac0fd73f028a40c2
This commit is contained in:
Andreas Jaeger 2015-08-12 16:13:48 +02:00
parent 40a877b000
commit 51ca5ddf67
10 changed files with 21 additions and 30 deletions

@ -25,7 +25,7 @@ security advisory below for more information.
implementations:
* `CORS in Object Storage <http://docs.openstack.org/kilo/config-reference/content/object-storage-cores.html>`_
* `CORS in dashboard <http://docs.openstack.org/security-guide/content/dashboard.html>`_
* `CORS in dashboard <http://docs.openstack.org/security-guide/dashboard/cross-origin-resource-sharing-cors.html>`_
Enabling CORS with configuration

@ -48,5 +48,5 @@ command can be used with it, as well, by returning a token-authenticated
address, as in the example above.
For further information and comparisons (including security
considerations), see the `security
guide <http://docs.openstack.org/security-guide/content/compute.html>`__.
considerations), see the `Security
Guide <http://docs.openstack.org/security-guide/compute.html>`__.

@ -88,8 +88,6 @@
to RST)</a>
<a href="/draft/ha-guide">High Availability
Guide (conversion to RST)</a>
<a href="/draft/security-guide-rst/">Security
Guide (conversion to RST)</a>
</div>
<div class="docs-link-sections">
<h3><i class="fa fa-users"></i>Draft Contribution Guides</h3>
@ -113,8 +111,8 @@
<a href="/draft/fr/image-guide/content/">Virtual Maching Image Guide</a>
<h4>Japanese (ja)</h4>
<a href="/ja/openstack-ops/content/">Operations Guide</a>
<a href="/draft/ja/security-guide-rst/">Security
Guide (conversion to RST)</a>
<a href="/draft/ja/security-guide/">Security
Guide</a>
<h4>Spanish (es)</h4>
<a href="/es/api/quick-start/content/index.html">API Quick Start</a>
<h4>Vietnamese (vi_VN)</h4>

@ -90,7 +90,7 @@
<a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
<a href="/high-availability-guide/content/index.html">High Availability Guide</a>
<a href="/ops/">Operations Guide</a>
<a href="/security-guide/content/">Security Guide</a>
<a href="/security-guide/">Security Guide</a>
<a href="/image-guide/content/">Virtual Machine Image Guide</a>
</div>
</div>
@ -100,7 +100,7 @@
<a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
<a href="/high-availability-guide/content/">High Availability Guide</a>
<a href="/ops/">Operations Guide</a>
<a href="/security-guide/content/">Security Guide</a>
<a href="/security-guide/">Security Guide</a>
<a href="/image-guide/content/">Virtual Machine Image Guide</a>
<a href="/arch-design/content/">Architecture Design Guide</a>
</div>

@ -90,7 +90,7 @@
<a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
<a href="/high-availability-guide/content/index.html">High Availability Guide</a>
<a href="/ops/">Operations Guide</a>
<a href="/security-guide/content/">Security Guide</a>
<a href="/security-guide/">Security Guide</a>
<a href="/image-guide/content/">Virtual Machine Image Guide</a>
</div>
</div>
@ -100,7 +100,7 @@
<a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
<a href="/high-availability-guide/content/">High Availability Guide</a>
<a href="/ops/">Operations Guide</a>
<a href="/security-guide/content/">Security Guide</a>
<a href="/security-guide/">Security Guide</a>
<a href="/image-guide/content/">Virtual Machine Image Guide</a>
<a href="/arch-design/content/">Architecture Design Guide</a>
</div>

@ -98,7 +98,7 @@
<a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
<a href="/high-availability-guide/content/index.html">High Availability Guide</a>
<a href="/ops/">Operations Guide</a>
<a href="/security-guide/content/">Security Guide</a>
<a href="/security-guide/">Security Guide</a>
<a href="/image-guide/content/">Virtual Machine Image Guide</a>
</div>
</div>
@ -109,7 +109,7 @@
<a href="/high-availability-guide/content/">High Availability Guide</a>
<a href="/networking-guide/">Networking Guide</a>
<a href="/ops/">Operations Guide</a>
<a href="/security-guide/content/">Security Guide</a>
<a href="/security-guide/">Security Guide</a>
<a href="/image-guide/content/">Virtual Machine Image Guide</a>
<a href="/arch-design/content/">Architecture Design Guide</a>
</div>

@ -96,7 +96,7 @@
<a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
<a href="/high-availability-guide/content/index.html">High Availability Guide</a>
<a href="/ops/">Operations Guide</a>
<a href="/security-guide/content/">Security Guide</a>
<a href="/security-guide/">Security Guide</a>
<a href="/image-guide/content/">Virtual Machine Image Guide</a>
</div>
</div>
@ -107,7 +107,7 @@
<a href="/high-availability-guide/content/">High Availability Guide</a>
<a href="/ops/">Operations Guide</a>
<a href="/networking-guide/">Networking Guide</a>
<a href="/security-guide/content/">Security Guide</a>
<a href="/security-guide/">Security Guide</a>
<a href="/image-guide/content/">Virtual Machine Image Guide</a>
<a href="/arch-design/content/">Architecture Design Guide</a>
</div>

@ -96,7 +96,7 @@
<a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
<a href="/high-availability-guide/content/index.html">High Availability Guide</a>
<a href="/ops/">Operations Guide</a>
<a href="/security-guide/content/">Security Guide</a>
<a href="/security-guide/">Security Guide</a>
<a href="/image-guide/content/">Virtual Machine Image Guide</a>
</div>
</div>
@ -107,7 +107,7 @@
<a href="/high-availability-guide/content/">High Availability Guide</a>
<a href="/ops/">Operations Guide</a>
<a href="/networking-guide/">Networking Guide</a>
<a href="/security-guide/content/">Security Guide</a>
<a href="/security-guide/">Security Guide</a>
<a href="/image-guide/content/">Virtual Machine Image Guide</a>
<a href="/arch-design/content/">Architecture Design Guide</a>
</div>

@ -21,8 +21,7 @@
</p>
<hr />
<h3>Get the Book!</h3>
<a class="overview-btn docs-btn" href="http://docs.openstack.org/security-guide/content/" onclick="recordOutboundLink(this, 'Outbound Links', 'security-guide.html');return false;"> Current HTML<i class="fa fa-arrow-circle-o-down"></i></a>
<a class="overview-btn docs-btn" href="http://docs.openstack.org/security-guide/security-guide.pdf" onclick="recordOutboundLink(this, 'Outbound Links', security-guide.pdf');return false;"> Current PDF<i class="fa fa-arrow-circle-o-down"></i></a>
<a class="overview-btn docs-btn" href="http://docs.openstack.org/security-guide/" onclick="recordOutboundLink(this, 'Outbound Links', 'security-guide.html');return false;"> Current HTML<i class="fa fa-arrow-circle-o-down"></i></a>
<a class="overview-btn docs-btn" href="http://www.lulu.com/commerce/index.php?fBuyContent=13956188" onclick="recordOutboundLink(this, 'Outbound Links', 'securitylulu.com');return false;"> buy it from Lulu<i class="fa fa-arrow-circle-o-right"></i></a>
</div>
@ -90,11 +89,7 @@
</li>
</ul>
<p>
You can get the
<a href="http://docs.openstack.org/security-guide/security-guide.pdf" onclick="recordOutboundLink(this, 'Outbound Links', security-guide.pdf');return false;">
PDF
</a>
to print yourself. If you'd like a bound copy,
If you'd like a bound copy of an older version,
<a href="http://www.lulu.com/commerce/index.php?fBuyContent=13956188" onclick="recordOutboundLink(this, 'Outbound Links', 'securitylulu.com');return false;">
buy it from Lulu
</a>
@ -102,7 +97,7 @@
</p>
<p>
<a href="http://www.lulu.com/commerce/index.php?fBuyContent=13956188">
<img alt="Support independent publishing: Buy this book on Lulu." border="0" src="http://static.lulu.com/images/services/buy_now_buttons/us/blue2.gif?20130702092152"/>
<img alt="Support independent publishing: Buy older version of the book on Lulu." border="0" src="http://static.lulu.com/images/services/buy_now_buttons/us/blue2.gif?20130702092152"/>
</a>
</p>
<div class="photo">

@ -46,11 +46,9 @@ redirect 301 /trunk/openstack-image/content/ /image-guide/content
redirect 301 /trunk/openstack-ha/content/ /high-availability-guide/content/
# Redirecting security guide to new location
redirect 301 /trunk/openstack-security/content/ /security-guide/content/
redirect 301 /trunk/security-guide/content/ /security-guide/content/
# Redirecting the changed page from Security Guide
redirect 301 /security-guide/content/ssl-proxies-and-http-services.html /security-guide/content/tls-proxies-and-http-services.html
redirectmatch 301 /trunk/openstack-security/content/.*$ /security-guide/index.html
redirectmatch 301 /trunk/security-guide/content/.*$ /security-guide/index.html
redirectmatch 301 /security-guide/content/.*$ /security-guide/index.html
# Redirecting API Programming with Compute API to API Quick Start
redirectmatch 301 /api/openstack-compute/programmer/content/.*$ /api/quick-start/content/