openstack/aodh
Code Issues Proposed changes

Stop shipping Apache2 configuration file

Browse Source 
Just include an example in the doc is enough.

Change-Id: I78522a7b86d26f287444ce0cbcc8584caf290ebf
This commit is contained in:
Julien Danjou 2017-01-31 16:53:12 +01:00
parent 4109e31304
commit 2ad5fb7864
2 changed files with 21 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
doc/source/install/mod_wsgi.rst
View File

@ -17,37 +17,30 @@
Installing the API behind mod_wsgi Installing the API behind mod_wsgi
=================================== ===================================
Aodh comes with a few example files for configuring the API Aodh comes with a WSGI application file named `aodh/api/app.wsgi` for
service to run behind Apache with ``mod_wsgi``. configuring the API service to run behind Apache with ``mod_wsgi``. This file
is installed with the rest of the Aodh application code, and should not need to
be modified.
app.wsgi You can then configure Apache with something like this::
========
The file ``aodh/api/app.wsgi`` sets up the V2 API WSGI Listen 8042
application. The file is installed with the rest of the Aodh
application code, and should not need to be modified.
etc/apache2/aodh <VirtualHost *:8042>
================ WSGIDaemonProcess aodh-api processes=2 threads=10 user=SOMEUSER display-name=%{GROUP}
WSGIProcessGroup aodh-api
WSGIScriptAlias / /usr/lib/python2.7/dist-packages/aodh/api/app
WSGIApplicationGroup %{GLOBAL}
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /var/log/httpd/aodh_error.log
CustomLog /var/log/httpd/aodh_access.log combined
</VirtualHost>
The ``etc/apache2/aodh`` file contains example settings that WSGISocketPrefix /var/run/httpd
work with a copy of Aodh installed via devstack.
.. literalinclude:: ../../../etc/apache2/aodh
1. On deb-based systems copy or symlink the file to Modify the ``WSGIDaemonProcess`` directive to set the ``user`` and ``group``
``/etc/apache2/sites-available``. For rpm-based systems the file will go in values to an appropriate user on your server. In many installations ``aodh``
``/etc/httpd/conf.d``. will be correct.
2. Modify the ``WSGIDaemonProcess`` directive to set the ``user`` and
``group`` values to an appropriate user on your server. In many
installations ``aodh`` will be correct.
3. Enable the Aodh site. On deb-based systems::
$ a2ensite aodh
$ service apache2 reload
On rpm-based systems::
$ service httpd reload

39
etc/apache2/aodh
View File

@ -1,39 +0,0 @@
# Copyright (c) 2013 New Dream Network, LLC (DreamHost)
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# This is an example Apache2 configuration file for using the
# aodh API through mod_wsgi.
# Note: If you are using a Debian-based system then the paths
# "/var/log/httpd" and "/var/run/httpd" will use "apache2" instead
# of "httpd".
#
# The number of processes and threads is an example only and should
# be adjusted according to local requirements.
Listen 8042
<VirtualHost *:8042>
WSGIDaemonProcess aodh-api processes=2 threads=10 user=SOMEUSER display-name=%{GROUP}
WSGIProcessGroup aodh-api
WSGIScriptAlias / /var/www/aodh/app
WSGIApplicationGroup %{GLOBAL}
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /var/log/httpd/aodh_error.log
CustomLog /var/log/httpd/aodh_access.log combined
</VirtualHost>
WSGISocketPrefix /var/run/httpd