openstack/keystone
Code Issues Proposed changes

Update Httpd configuration docs for sites-available/enabled

Browse Source 
Newer releases of Apache Httpd server prefer to use sites-available /
sites-enabled configuration directories, but the Apache setup
documentation was still using conf.d. This change updates the Apache
setup documentation to use the preferred method.

Change-Id: I00a4cef2e4194b07f12ed0c0f6c584f236771a00
This commit is contained in:
Brant Knudson 2015-07-31 14:10:06 -05:00
parent 22efaf0efb
commit 3bac87ef2c
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
doc/source/apache-httpd.rst
View File

@ -31,18 +31,23 @@ Running Keystone in HTTPD
Files
-----
Copy the file httpd/wsgi-keystone.conf to the appropriate location for your
Apache server, most likely::
Copy the ``httpd/wsgi-keystone.conf`` sample configuration file to the
appropriate location for your Apache server::
/etc/httpd/conf.d/wsgi-keystone.conf
/etc/$APACHE_DIR/conf.d/sites-available/wsgi-keystone.conf
Update this file to match your system configuration (for example, some
distributions put httpd logs in the ``apache2`` directory and some in the
``httpd`` directory; also, enable TLS).
Where ``$APACHE_DIR`` is ``httpd`` on Fedora-based systems and ``apache2`` on
Debian/Ubuntu systems.
Update the file to match your system configuration. Note the following:
* Make sure the correct log directory is used. Some distributions put httpd
server logs in the ``apache2`` directory and some in the ``httpd`` directory.
* Enable TLS by supplying the correct certificates.
Create the directory ``/var/www/cgi-bin/keystone/``. You can either hardlink or
softlink the files ``main`` and ``admin`` to the file ``keystone.py`` in this
directory. For a distribution appropriate place, it should probably be copied
directory. For a distribution-appropriate place, it should probably be copied
to::
/usr/share/openstack/keystone/httpd/keystone.py
@ -51,6 +56,14 @@ Keystone's primary configuration file (``etc/keystone.conf``) and the
PasteDeploy configuration file (``etc/keystone-paste.ini``) must be readable to
HTTPD in one of the default locations described in :doc:`configuration`.
Enable the site by creating a symlink from ``sites-enabled`` to the file in
``sites-available``::
ln -s /etc/$APACHE_DIR/sites-available/keystone.conf /etc/$APACHE_DIR/sites-enabled/
Restart Apache to have it start serving keystone.
Access Control
--------------