From 51ca5ddf675d01060f666e9c5094097cdb17fc48 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 12 Aug 2015 16:13:48 +0200 Subject: [PATCH] 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 --- .../source/cross_project_cors.rst | 2 +- .../source/cli_access_instance_through_a_console.rst | 4 ++-- www/draft/draft-index.html | 6 ++---- www/havana/index.html | 4 ++-- www/icehouse/index.html | 4 ++-- www/index.html | 4 ++-- www/juno/index.html | 4 ++-- www/kilo/index.html | 4 ++-- www/sec/index.html | 11 +++-------- www/static/.htaccess | 8 +++----- 10 files changed, 21 insertions(+), 30 deletions(-) diff --git a/doc/admin-guide-cloud-rst/source/cross_project_cors.rst b/doc/admin-guide-cloud-rst/source/cross_project_cors.rst index b6f7507224..541e899599 100644 --- a/doc/admin-guide-cloud-rst/source/cross_project_cors.rst +++ b/doc/admin-guide-cloud-rst/source/cross_project_cors.rst @@ -25,7 +25,7 @@ security advisory below for more information. implementations: * `CORS in Object Storage `_ - * `CORS in dashboard `_ + * `CORS in dashboard `_ Enabling CORS with configuration diff --git a/doc/user-guide/source/cli_access_instance_through_a_console.rst b/doc/user-guide/source/cli_access_instance_through_a_console.rst index f1bc02c309..4a386b2e1d 100644 --- a/doc/user-guide/source/cli_access_instance_through_a_console.rst +++ b/doc/user-guide/source/cli_access_instance_through_a_console.rst @@ -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 `__. +considerations), see the `Security +Guide `__. diff --git a/www/draft/draft-index.html b/www/draft/draft-index.html index c22e2bcddc..424caf527c 100644 --- a/www/draft/draft-index.html +++ b/www/draft/draft-index.html @@ -88,8 +88,6 @@ to RST) High Availability Guide (conversion to RST) - Security - Guide (conversion to RST)

Draft Contribution Guides

@@ -113,8 +111,8 @@ Virtual Maching Image Guide

Japanese (ja)

Operations Guide - Security - Guide (conversion to RST) + Security + Guide

Spanish (es)

API Quick Start

Vietnamese (vi_VN)

diff --git a/www/havana/index.html b/www/havana/index.html index 46977d7270..099f9208e3 100644 --- a/www/havana/index.html +++ b/www/havana/index.html @@ -90,7 +90,7 @@ Cloud Administrator Guide High Availability Guide Operations Guide - Security Guide + Security Guide Virtual Machine Image Guide
@@ -100,7 +100,7 @@ Cloud Administrator Guide High Availability Guide Operations Guide - Security Guide + Security Guide Virtual Machine Image Guide Architecture Design Guide diff --git a/www/icehouse/index.html b/www/icehouse/index.html index 53a8a4c0c8..0973f5867d 100644 --- a/www/icehouse/index.html +++ b/www/icehouse/index.html @@ -90,7 +90,7 @@ Cloud Administrator Guide High Availability Guide Operations Guide - Security Guide + Security Guide Virtual Machine Image Guide @@ -100,7 +100,7 @@ Cloud Administrator Guide High Availability Guide Operations Guide - Security Guide + Security Guide Virtual Machine Image Guide Architecture Design Guide diff --git a/www/index.html b/www/index.html index 7c0393aa28..df7e1b7d1e 100644 --- a/www/index.html +++ b/www/index.html @@ -98,7 +98,7 @@ Cloud Administrator Guide High Availability Guide Operations Guide - Security Guide + Security Guide Virtual Machine Image Guide @@ -109,7 +109,7 @@ High Availability Guide Networking Guide Operations Guide - Security Guide + Security Guide Virtual Machine Image Guide Architecture Design Guide diff --git a/www/juno/index.html b/www/juno/index.html index e75c61a2cb..fe180da083 100644 --- a/www/juno/index.html +++ b/www/juno/index.html @@ -96,7 +96,7 @@ Cloud Administrator Guide High Availability Guide Operations Guide - Security Guide + Security Guide Virtual Machine Image Guide @@ -107,7 +107,7 @@ High Availability Guide Operations Guide Networking Guide - Security Guide + Security Guide Virtual Machine Image Guide Architecture Design Guide diff --git a/www/kilo/index.html b/www/kilo/index.html index 65c7da67f8..3cda701ce1 100644 --- a/www/kilo/index.html +++ b/www/kilo/index.html @@ -96,7 +96,7 @@ Cloud Administrator Guide High Availability Guide Operations Guide - Security Guide + Security Guide Virtual Machine Image Guide @@ -107,7 +107,7 @@ High Availability Guide Operations Guide Networking Guide - Security Guide + Security Guide Virtual Machine Image Guide Architecture Design Guide diff --git a/www/sec/index.html b/www/sec/index.html index cb3a8c69d4..575bbafa55 100644 --- a/www/sec/index.html +++ b/www/sec/index.html @@ -21,8 +21,7 @@

Get the Book!

- Current HTML - Current PDF + Current HTML buy it from Lulu @@ -90,11 +89,7 @@

- You can get the - - PDF - - to print yourself. If you'd like a bound copy, + If you'd like a bound copy of an older version, buy it from Lulu @@ -102,7 +97,7 @@

- Support independent publishing: Buy this book on Lulu. + Support independent publishing: Buy older version of the book on Lulu.

diff --git a/www/static/.htaccess b/www/static/.htaccess index a81c3d5aac..36257a4865 100644 --- a/www/static/.htaccess +++ b/www/static/.htaccess @@ -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/