diff --git a/doc/metadata/rhel7/V-71863.rst b/doc/metadata/rhel7/V-71863.rst index 6f0c8de0..0c2f61a6 100644 --- a/doc/metadata/rhel7/V-71863.rst +++ b/doc/metadata/rhel7/V-71863.rst @@ -7,4 +7,4 @@ tag: misc The security role already deploys a login banner for console logins with tasks from another STIG: -* :ref:`stig-V-V-7225` +* :ref:`stig-V-72225` diff --git a/doc/metadata/rhel7/V-71927.rst b/doc/metadata/rhel7/V-71927.rst index f6f2a1b6..99124dcc 100644 --- a/doc/metadata/rhel7/V-71927.rst +++ b/doc/metadata/rhel7/V-71927.rst @@ -11,7 +11,7 @@ coordination. Deployers can opt-in for this change by setting the following Ansible variable: -.. code-block:: +.. code-block:: yaml security_set_minimum_password_lifetime: yes diff --git a/doc/metadata/rhel7/V-71931.rst b/doc/metadata/rhel7/V-71931.rst index 33a3d063..b49effc2 100644 --- a/doc/metadata/rhel7/V-71931.rst +++ b/doc/metadata/rhel7/V-71931.rst @@ -11,7 +11,7 @@ rotation may reduce overall security in some situations. Deployers can opt-in for this change by setting the following Ansible variable: -.. code-block:: +.. code-block:: yaml security_set_maximum_password_lifetime: yes diff --git a/doc/source/domains.rst b/doc/source/domains.rst index 0a05c331..f2774e81 100644 --- a/doc/source/domains.rst +++ b/doc/source/domains.rst @@ -1,4 +1,4 @@ -.. _hardening-domains-label: +.. _hardening_domains_label: Hardening Domains ================= @@ -19,7 +19,6 @@ domain and the STIG requirements that go along with each. rhel7/domains/auth.rst rhel7/domains/file_perms.rst rhel7/domains/graphical.rst - rhel7/domains/implemented.rst rhel7/domains/kernel.rst rhel7/domains/lsm.rst rhel7/domains/misc.rst diff --git a/doc/source/getting-started.rst b/doc/source/getting-started.rst index 204d64e8..a153b3ef 100644 --- a/doc/source/getting-started.rst +++ b/doc/source/getting-started.rst @@ -81,7 +81,7 @@ is an example of a basic playbook that uses the ansible-hardening role: The variables provided in the ``vars`` section can enable, disable, or alter configuration for various tasks in the ansible-hardening role. For more details -on the available variables, refer to the :ref:`hardening-domains_label` +on the available variables, refer to the :ref:`hardening_domains_label` section. .. note:: diff --git a/doc/source/index.rst b/doc/source/index.rst index 6d201e89..7ec4effb 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -104,9 +104,10 @@ Pike * **Documentation:** + * `ansible-hardening Pike Documentation`_ * `ansible-hardening Pike Release Notes`_ -.. _ansible-hardening Pike Documentation: http://docs.openstack.org/developer/ansible-hardening/pike/ +.. _ansible-hardening Pike Documentation: https://docs.openstack.org/ansible-hardening/pike/ .. _ansible-hardening Pike Release Notes: http://docs.openstack.org/releasenotes/ansible-hardening/pike.html Ocata @@ -126,7 +127,7 @@ Ocata * `ansible-hardening Ocata Documentation`_ * `ansible-hardening Ocata Release Notes`_ -.. _ansible-hardening Ocata Documentation: http://docs.openstack.org/developer/ansible-hardening/ocata/ +.. _ansible-hardening Ocata Documentation: https://docs.openstack.org/ansible-hardening/ocata/ .. _ansible-hardening Ocata Release Notes: http://docs.openstack.org/releasenotes/ansible-hardening/ocata.html Newton @@ -146,5 +147,5 @@ Newton * `ansible-hardening Newton Documentation`_ * `ansible-hardening Newton Release Notes`_ -.. _ansible-hardening Newton Documentation: http://docs.openstack.org/developer/ansible-hardening/newton/ +.. _ansible-hardening Newton Documentation: https://docs.openstack.org/ansible-hardening/newton/ .. _ansible-hardening Newton Release Notes: http://docs.openstack.org/releasenotes/ansible-hardening/newton.html diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 2583eddb..55e62917 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -58,11 +58,12 @@ master_doc = 'index' author = 'OpenStack-Ansible Contributors' category = 'Miscellaneous' copyright = '2014-2017, OpenStack-Ansible Contributors' -description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.' -project = 'OpenStack-Ansible' +description = ('The ansible-hardening Ansible role uses industry-standard ' + 'security hardening guides to secure Linux hosts.') +project = 'ansible-hardening' role_name = 'ansible-hardening' target_name = 'ansible-hardening' -title = 'ansible-hardening Documentation:' +title = 'ansible-hardening Release Notes:' # The link to the browsable source code (for the left hand menu) oslosphinx_cgit_link = ( diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index f5871933..b9887b8b 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -1,12 +1,11 @@ -================================ - OpenStack-Ansible Release Notes -================================ +=============================== +ansible-hardening Release Notes +=============================== .. toctree:: :maxdepth: 1 - liberty - mitaka - newton unreleased + pike ocata + newton diff --git a/releasenotes/source/liberty.rst b/releasenotes/source/liberty.rst deleted file mode 100644 index 2c5d8327..00000000 --- a/releasenotes/source/liberty.rst +++ /dev/null @@ -1,6 +0,0 @@ -============================== - Liberty Series Release Notes -============================== - -.. release-notes:: - :branch: origin/liberty diff --git a/releasenotes/source/mitaka.rst b/releasenotes/source/mitaka.rst deleted file mode 100644 index 0dc585c8..00000000 --- a/releasenotes/source/mitaka.rst +++ /dev/null @@ -1,6 +0,0 @@ -============================= - Mitaka Series Release Notes -============================= - -.. release-notes:: - :branch: origin/stable/mitaka diff --git a/releasenotes/source/pike.rst b/releasenotes/source/pike.rst new file mode 100644 index 00000000..095c4795 --- /dev/null +++ b/releasenotes/source/pike.rst @@ -0,0 +1,6 @@ +=================================== + Pike Series Release Notes +=================================== + +.. release-notes:: + :branch: origin/stable/pike