[www] remove Security Guide landing index page

Change-Id: I4f7af89dfcd3f0661149724601ae889a4e9a153b

doc/admin-guide/source/compute-security.rst

@@ -6,7 +6,7 @@ Security hardening
 
 OpenStack Compute can be integrated with various third-party
 technologies to increase security. For more information, see the
-`OpenStack Security Guide <https://docs.openstack.org/sec/>`_.
+`OpenStack Security Guide <https://docs.openstack.org/security-guide/>`_.
 
 Trusted compute pools
 ~~~~~~~~~~~~~~~~~~~~~

doc/arch-design-draft/source/design-networking.rst

@@ -21,7 +21,8 @@ services that are essential for stable operation.
    Additionally, you must research and discuss cloud network connectivity
    through proxy servers and firewalls.
 
-See the `OpenStack Security Guide <https://docs.openstack.org/sec/>`_ for tips
+See the `OpenStack Security Guide
+<https://docs.openstack.org/security-guide/>`_ for tips
 on securing your network.
 
 Networking (neutron)

doc/common/app-support.rst

@@ -56,7 +56,7 @@ The following books explain how to configure and run an OpenStack cloud:
 
 *  `High Availability Guide <https://docs.openstack.org/ha-guide/>`_
 
-*  `Security Guide <https://docs.openstack.org/sec/>`_
+*  `Security Guide <https://docs.openstack.org/security-guide/>`_
 
 *  `Virtual Machine Image Guide <https://docs.openstack.org/image-guide/>`_
 

doc/contributor-guide/source/blueprints-and-specs.rst

@@ -148,7 +148,7 @@ Guides for deployers and administrators
 * `OpenStack High Availability Guide <https://docs.openstack.org/ha-guide/>`_:
   Describes potential strategies for making your OpenStack services and
   related controllers and data stores highly available.
-* `OpenStack Security Guide <https://docs.openstack.org/sec/>`_:
+* `OpenStack Security Guide <https://docs.openstack.org/security-guide/>`_:
   Provide best practices and conceptual
   information about securing an OpenStack cloud.
 * `OpenStack Virtual Machine Image Guide

doc/install-guide/source/environment-networking-verify.rst

@@ -86,7 +86,7 @@ among the nodes before proceeding further.
       default. During the installation process, certain steps will
       fail unless you alter or disable the firewall. For more
       information about securing your environment, refer to the
-      `OpenStack Security Guide <https://docs.openstack.org/sec/>`__.
+      `OpenStack Security Guide <https://docs.openstack.org/security-guide/>`_.
 
    .. endonly
 
@@ -95,6 +95,6 @@ among the nodes before proceeding further.
       Your distribution does not enable a restrictive :term:`firewall`
       by default. For more information about securing your environment,
       refer to the
-      `OpenStack Security Guide <https://docs.openstack.org/sec/>`__.
+      `OpenStack Security Guide <https://docs.openstack.org/security-guide/>`_.
 
    .. endonly

doc/install-guide/source/environment-networking.rst

@@ -121,7 +121,7 @@ the controller node.
       default. During the installation process, certain steps will
       fail unless you alter or disable the firewall. For more
       information about securing your environment, refer to the
-      `OpenStack Security Guide <https://docs.openstack.org/sec/>`__.
+      `OpenStack Security Guide <https://docs.openstack.org/security-guide/>`_.
 
    .. endonly
 
@@ -130,7 +130,7 @@ the controller node.
       Your distribution does not enable a restrictive :term:`firewall`
       by default. For more information about securing your environment,
       refer to the
-      `OpenStack Security Guide <https://docs.openstack.org/sec/>`__.
+      `OpenStack Security Guide <https://docs.openstack.org/security-guide/>`_.
 
    .. endonly
 

doc/ops-guide/source/arch-network-design.rst

@@ -289,5 +289,5 @@ Conclusion
 Armed with your IP address layout and numbers and knowledge about the
 topologies and services you can use, it's now time to prepare the
 network for your installation. Be sure to also check out the `OpenStack
-Security Guide <https://docs.openstack.org/sec/>`_ for tips on securing
+Security Guide <https://docs.openstack.org/security-guide/>`_ for tips on securing
 your network. We wish you a good relationship with your networking team!

doc/ops-guide/source/ops-advanced-configuration.rst

@@ -106,7 +106,7 @@ consider tuning. It is by no means an exhaustive list.
 Security Configuration for Compute, Networking, and Storage
 -----------------------------------------------------------
 
-The `OpenStack Security Guide <https://docs.openstack.org/sec/>`_
+The `OpenStack Security Guide <https://docs.openstack.org/security-guide/>`_
 provides a deep dive into securing an OpenStack cloud, including
 SSL/TLS, key management, PKI and certificate management, data transport
 and privacy concerns, and compliance.

doc/ops-guide/source/preface.rst

@@ -160,7 +160,7 @@ Installation Tutorials and Guides
     Describes potential strategies for making your OpenStack services
     and related controllers and data stores highly available
 
-`OpenStack Security Guide <https://docs.openstack.org/sec/>`_
+`OpenStack Security Guide <https://docs.openstack.org/security-guide/>`_
     Provides best practices and conceptual information about securing an
     OpenStack cloud
 

www/sec/index.html

@@ -1,107 +0,0 @@
-{% set scriptdir = '../common/js/' %}
-{% set cssdir = '../common/css/' %}
-{% extends "templates/base.tmpl" %}
-{% block pagetitle %}Security Guide{% endblock %}
-{% block title %}
-<a href="https://docs.openstack.org/">Documentation</a> &gt; Security Guide
-{% endblock %}
-{% block content %}
-    <div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>OpenStack Security Guide</h1>
-  <p><strong>The OpenStack Security Guide provides best practices learned by cloud operators while hardening their OpenStack deployments.
-</strong>
- This book was written by a close community of security experts from the
-   <a href="https://launchpad.net/~openstack-ossg">
-    OpenStack Security Group
-   </a>
-   in an intense week-long effort at an undisclosed location. One of the goals for this book is to bring together interested members to capture their collective knowledge and give it to the OpenStack community.
-  </p>
-<hr />
-                <h3>Get the Book!</h3>
- <a class="overview-btn docs-btn" href="/security-guide/" onclick="recordOutboundLink(this, 'Outbound Links', 'security-guide.html');return false;"> Current HTML<i class="fa fa-arrow-circle-o-down"></i></a>
-       </div>
-        <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-        <img src="../common/images/openstack-security-guide.jpg" width="100%"/>
-        </div>
-
-       </div>
-    </div>
-</div>
-
-<div class="mid-docs-wrapper" id="docs-main-body">
- <div class="container">
-            <div class="row">
-                <div class="col-lg-12">
-                </div>
-            </div>
-
- <div class="row">
-  <p>
-   In this book you'll find practical security guidance:
-  </p>
-  <ul>
-   <li>
-    Discussions about each OpenStack service
-   </li>
-   <li>
-    Information about isolating security domains and securing domain bridges
-   </li>
-   <li>
-    Public and private cloud considerations
-   </li>
-   <li>
-    Best practices for management layers and access
-   </li>
-   <li>
-    Secure node bootstrapping and hardening
-   </li>
-   <li>
-    SSL, SSH, and PKI availability per OpenStack service
-   </li>
-   <li>
-    API endpoint best practices
-   </li>
-   <li>
-    Security for messaging transport and queues
-   </li>
-   <li>
-    Database and data security best practices and considerations
-   </li>
-   <li>
-    Hypervisor selection advice
-   </li>
-   <li>
-    Security services available for OpenStack instances and trusted images
-   </li>
-   <li>
-    Migration information
-   </li>
-   <li>
-    Logging information and considerations
-   </li>
-   <li>
-    Access control and identity management concepts
-   </li>
-  </ul>
-  <div class="photo">
-   <img src="../common/images/openstack-security-guide-team.jpg" width="100%"/>
-  </div>
-  <p align="right">
-   <a href="http://creativecommons.org/licenses/by/3.0/us/" rel="license">
-    <img alt="Creative Commons License" src="http://i.creativecommons.org/l/by/3.0/us/88x31.png" style="border-width:0"/>
-   </a>
-   <br/>
-   This work is licensed under a
-   <a href="http://creativecommons.org/licenses/by/3.0/us/" rel="license">
-    Creative Commons Attribution 3.0 United States License
-   </a>
-   .
-  </p>
- </div>
-</div>
-</div>
-</div>
-{% endblock content %}

www/static/.htaccess

@@ -83,13 +83,16 @@ redirectmatch /network-admin/admin/content/.*$ /admin-guide/index.html
 # Redirect O'Reilly Operations Guide PDF to trunk version
 redirect 301 /trunk/openstack-ops/oreilly-openstack-ops-guide.pdf /openstack-ops/openstack-ops-manual.pdf
 
-# Redirect Operations Guide to /openstack-ops-guide
+# Redirect Operations Guide to /ops-guide/
 redirectmatch 301 /trunk/openstack-ops/.*$ /ops-guide/
 redirect 301 /ops/index.html /ops-guide/index.html
 
-# Redirect Architecture Guide to /openstack-arch-design
+# Redirect Architecture Guide to /arch-design/
 redirect 301 /arch/index.html /arch-design/index.html
 
+# Redirect Security Guide to /security-guide/
+redirect 301 /sec/index.html /security-guide/index.html
+
 # A doc generation bug resulted in Google indexing links containing "//", which cause
 # problems with linked content (images/css/etc).  This rule generates a 301 redirect
 # for these links.

www/static/sitemap.xml

@@ -1295,12 +1295,6 @@
     <lastmod>2017-02-22T20:49:07+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
-  <url>
-    <priority>1.0</priority>
-    <loc>https://docs.openstack.org/sec/</loc>
-    <lastmod>2017-02-22T20:49:07+0000</lastmod>
-    <changefreq>daily</changefreq>
-  </url>
   <url>
     <priority>1.0</priority>
     <loc>https://docs.openstack.org/ocata/install-guide-obs/</loc>

www/www-index.html

@@ -7,17 +7,14 @@
 <li><a href="www/draft/draft-index.html">/draft/draft-index.html</a></li>
 <li><a href="www/errorpage.html">/errorpage.html</a></li>
 <li><a href="www/api/api-ref-guides.html">/api/api-ref-guides.html</a></li>
-<li><a href="www/arch/index.html">/arch/index.html</a></li>
 <li><a href="www/developer/language-bindings.html">/developer/language-bindings.html</a></li>
 <li><a href="www/developer/openstack-projects.html">/developer/openstack-projects.html</a></li>
-<li><a href="www/ops/index.html">/ops/index.html</a></li>
 <li><a href="www/project-install-guide/draft/index.html">/project-install-guide/draft/index.html</a></li>
 <li><a href="www/project-install-guide/newton/index.html">/project-install-guide/newton/index.html</a></li>
 <li><a href="www/project-install-guide/ocata/index.html">/project-install-guide/ocata/index.html</a></li>
 <li><a href="www/project-deploy-guide/draft/index.html">/project-deploy-guide/draft/index.html</a></li>
 <li><a href="www/project-deploy-guide/newton/index.html">/project-deploy-guide/newton/index.html</a></li>
 <li><a href="www/project-deploy-guide/ocata/index.html">/project-deploy-guide/ocata/index.html</a></li>
-<li><a href="www/sec/index.html">/sec/index.html</a></li>
 <li><a href="www/training_labs/index.html">/training_labs/index.html</a></li>
 <!-- release -->
 <li><a href="www/juno/index.html">/juno/index.html</a></li>