openstack/keystone
Code Issues Proposed changes

Merge "Remove apache-httpd related link"

Browse Source
This commit is contained in:
Zuul 2017-11-24 18:57:38 +00:00 committed by Gerrit Code Review
commit ed5db220be
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/source/advanced-topics/federation/configure_federation.rst
View File

@ -51,11 +51,14 @@ Ubuntu 14.04 and Apache 2.4.7.
To enable federation, you'll need to: To enable federation, you'll need to:
1. `Run keystone under Apache`_, rather than using uwsgi command. 1. Run keystone under Apache for `SUSE`_, `RedHat`_ or `Ubuntu`_, rather than
using uwsgi command.
2. `Configure Apache to use a federation capable authentication method`_. 2. `Configure Apache to use a federation capable authentication method`_.
3. `Configure Federation in Keystone`_. 3. `Configure Federation in Keystone`_.
.. _`Run keystone under Apache`: ../apache-httpd.html .. _`SUSE`: ../../install/keystone-install-obs.html#configure-the-apache-http-server
.. _`RedHat`: ../../install/keystone-install-rdo.html#configure-the-apache-http-server
.. _`Ubuntu`: ../../install/keystone-install-ubuntu.html#configure-the-apache-http-server
Configure Apache to use a federation capable authentication method Configure Apache to use a federation capable authentication method
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

7
doc/source/advanced-topics/federation/mellon.rst
View File

@ -20,9 +20,12 @@ Setup Mellon
Configure Apache HTTPD for mod_auth_mellon Configure Apache HTTPD for mod_auth_mellon
------------------------------------------ ------------------------------------------
Follow the steps outlined at: `Running Keystone in HTTPD`_. Follow the steps outlined at: Keystone install guide for `SUSE`_, `RedHat`_ or
`Ubuntu`_.
.. _`Running Keystone in HTTPD`: ../apache-httpd.html .. _`SUSE`: ../../install/keystone-install-obs.html#configure-the-apache-http-server
.. _`RedHat`: ../../install/keystone-install-rdo.html#configure-the-apache-http-server
.. _`Ubuntu`: ../../install/keystone-install-ubuntu.html#configure-the-apache-http-server
You'll also need to install the Apache module `mod_auth_mellon You'll also need to install the Apache module `mod_auth_mellon
<https://github.com/UNINETT/mod_auth_mellon>`_. For example: <https://github.com/UNINETT/mod_auth_mellon>`_. For example:

7
doc/source/advanced-topics/federation/shibboleth.rst
View File

@ -20,9 +20,12 @@ Setup Shibboleth
Configure Apache HTTPD for mod_shibboleth Configure Apache HTTPD for mod_shibboleth
----------------------------------------- -----------------------------------------
Follow the steps outlined at: `Running Keystone in HTTPD`_. Follow the steps outlined at: Running Keystone in HTTPD for `SUSE`_, `RedHat`_
or `Ubuntu`_.
.. _`Running Keystone in HTTPD`: ../apache-httpd.html .. _`SUSE`: ../../install/keystone-install-obs.html#configure-the-apache-http-server
.. _`RedHat`: ../../install/keystone-install-rdo.html#configure-the-apache-http-server
.. _`Ubuntu`: ../../install/keystone-install-ubuntu.html#configure-the-apache-http-server
You'll also need to install `Shibboleth <https://wiki.shibboleth.net/confluence/display/SHIB2/Home>`_, for You'll also need to install `Shibboleth <https://wiki.shibboleth.net/confluence/display/SHIB2/Home>`_, for
example: example:

2
httpd/README
View File

@ -1,2 +1,2 @@
Documentation for running Keystone with Apache HTTPD is in Documentation for running Keystone with Apache HTTPD is in
doc/source/apache-httpd.rst doc/source/install/