diff --git a/doc/admin-guide/source/compute-security.rst b/doc/admin-guide/source/compute-security.rst index 61a425b25c..3e54894c4e 100644 --- a/doc/admin-guide/source/compute-security.rst +++ b/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 `_. +`OpenStack Security Guide `_. Trusted compute pools ~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/arch-design-draft/source/design-networking.rst b/doc/arch-design-draft/source/design-networking.rst index 85ffd87190..8375d7aa47 100644 --- a/doc/arch-design-draft/source/design-networking.rst +++ b/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 `_ for tips +See the `OpenStack Security Guide +`_ for tips on securing your network. Networking (neutron) diff --git a/doc/common/app-support.rst b/doc/common/app-support.rst index 7c1a473588..c8573126c5 100644 --- a/doc/common/app-support.rst +++ b/doc/common/app-support.rst @@ -56,7 +56,7 @@ The following books explain how to configure and run an OpenStack cloud: * `High Availability Guide `_ -* `Security Guide `_ +* `Security Guide `_ * `Virtual Machine Image Guide `_ diff --git a/doc/contributor-guide/source/blueprints-and-specs.rst b/doc/contributor-guide/source/blueprints-and-specs.rst index ecb38e6dc9..deb83faeca 100644 --- a/doc/contributor-guide/source/blueprints-and-specs.rst +++ b/doc/contributor-guide/source/blueprints-and-specs.rst @@ -148,7 +148,7 @@ Guides for deployers and administrators * `OpenStack High Availability Guide `_: Describes potential strategies for making your OpenStack services and related controllers and data stores highly available. -* `OpenStack Security Guide `_: +* `OpenStack Security Guide `_: Provide best practices and conceptual information about securing an OpenStack cloud. * `OpenStack Virtual Machine Image Guide diff --git a/doc/install-guide/source/environment-networking-verify.rst b/doc/install-guide/source/environment-networking-verify.rst index 942e2dbe3a..7ed187fca9 100644 --- a/doc/install-guide/source/environment-networking-verify.rst +++ b/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 `__. + `OpenStack 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 `__. + `OpenStack Security Guide `_. .. endonly diff --git a/doc/install-guide/source/environment-networking.rst b/doc/install-guide/source/environment-networking.rst index fd82011925..64e3a34a8b 100644 --- a/doc/install-guide/source/environment-networking.rst +++ b/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 `__. + `OpenStack 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 `__. + `OpenStack Security Guide `_. .. endonly diff --git a/doc/ops-guide/source/arch-network-design.rst b/doc/ops-guide/source/arch-network-design.rst index 7838fc309d..54848d225e 100644 --- a/doc/ops-guide/source/arch-network-design.rst +++ b/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 `_ for tips on securing +Security Guide `_ for tips on securing your network. We wish you a good relationship with your networking team! diff --git a/doc/ops-guide/source/ops-advanced-configuration.rst b/doc/ops-guide/source/ops-advanced-configuration.rst index e0bec29c88..502749b244 100644 --- a/doc/ops-guide/source/ops-advanced-configuration.rst +++ b/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 `_ +The `OpenStack 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. diff --git a/doc/ops-guide/source/preface.rst b/doc/ops-guide/source/preface.rst index 5bbb1714f1..50e07ecfb0 100644 --- a/doc/ops-guide/source/preface.rst +++ b/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 `_ +`OpenStack Security Guide `_ Provides best practices and conceptual information about securing an OpenStack cloud diff --git a/www/sec/index.html b/www/sec/index.html deleted file mode 100644 index 5cd31bc822..0000000000 --- a/www/sec/index.html +++ /dev/null @@ -1,107 +0,0 @@ -{% set scriptdir = '../common/js/' %} -{% set cssdir = '../common/css/' %} -{% extends "templates/base.tmpl" %} -{% block pagetitle %}Security Guide{% endblock %} -{% block title %} -Documentation > Security Guide -{% endblock %} -{% block content %} -
-
-
-
-

OpenStack Security Guide

-

The OpenStack Security Guide provides best practices learned by cloud operators while hardening their OpenStack deployments. - - This book was written by a close community of security experts from the - - OpenStack Security Group - - 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. -

-
-

Get the Book!

- Current HTML -
-
- -
- -
-
-
- -
-
-
-
-
-
- -
-

- In this book you'll find practical security guidance: -

-
    -
  • - Discussions about each OpenStack service -
    • -
  • - Information about isolating security domains and securing domain bridges -
    • -
  • - Public and private cloud considerations -
    • -
  • - Best practices for management layers and access -
    • -
  • - Secure node bootstrapping and hardening -
    • -
  • - SSL, SSH, and PKI availability per OpenStack service -
    • -
  • - API endpoint best practices -
    • -
  • - Security for messaging transport and queues -
    • -
  • - Database and data security best practices and considerations -
    • -
  • - Hypervisor selection advice -
    • -
  • - Security services available for OpenStack instances and trusted images -
    • -
  • - Migration information -
    • -
  • - Logging information and considerations -
    • -
  • - Access control and identity management concepts -
    • -
-
- -
-

- - Creative Commons License - -
- This work is licensed under a - - Creative Commons Attribution 3.0 United States License - - . -

-
-
-
- -{% endblock content %} diff --git a/www/static/.htaccess b/www/static/.htaccess index 1258259666..a4c29a7d01 100644 --- a/www/static/.htaccess +++ b/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. diff --git a/www/static/common/images/openstack-security-guide-team.jpg b/www/static/common/images/openstack-security-guide-team.jpg deleted file mode 100644 index a1b5b50d52..0000000000 Binary files a/www/static/common/images/openstack-security-guide-team.jpg and /dev/null differ diff --git a/www/static/common/images/openstack-security-guide.jpg b/www/static/common/images/openstack-security-guide.jpg deleted file mode 100644 index 77042eea97..0000000000 Binary files a/www/static/common/images/openstack-security-guide.jpg and /dev/null differ diff --git a/www/static/sitemap.xml b/www/static/sitemap.xml index b5dd9a603a..79b6ca3205 100644 --- a/www/static/sitemap.xml +++ b/www/static/sitemap.xml @@ -1295,12 +1295,6 @@ 2017-02-22T20:49:07+0000 daily - - 1.0 - https://docs.openstack.org/sec/ - 2017-02-22T20:49:07+0000 - daily - 1.0 https://docs.openstack.org/ocata/install-guide-obs/ diff --git a/www/www-index.html b/www/www-index.html index 3bf27dfc7d..a7046b0601 100644 --- a/www/www-index.html +++ b/www/www-index.html @@ -7,17 +7,14 @@
  • /draft/draft-index.html
  • /errorpage.html
  • /api/api-ref-guides.html
    • -
  • /arch/index.html
  • /developer/language-bindings.html
  • /developer/openstack-projects.html
    • -
  • /ops/index.html
  • /project-install-guide/draft/index.html
  • /project-install-guide/newton/index.html
  • /project-install-guide/ocata/index.html
  • /project-deploy-guide/draft/index.html
  • /project-deploy-guide/newton/index.html
  • /project-deploy-guide/ocata/index.html
    • -
  • /sec/index.html
  • /training_labs/index.html
  • /juno/index.html