diff --git a/doc/source/install/mod_wsgi.rst b/doc/source/install/mod_wsgi.rst index b204a0dab..890c6713f 100644 --- a/doc/source/install/mod_wsgi.rst +++ b/doc/source/install/mod_wsgi.rst @@ -17,37 +17,30 @@ Installing the API behind mod_wsgi =================================== -Aodh comes with a few example files for configuring the API -service to run behind Apache with ``mod_wsgi``. +Aodh comes with a WSGI application file named `aodh/api/app.wsgi` for +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 -application. The file is installed with the rest of the Aodh -application code, and should not need to be modified. + Listen 8042 -etc/apache2/aodh -================ + + 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} + = 2.4> + ErrorLogFormat "%{cu}t %M" + + ErrorLog /var/log/httpd/aodh_error.log + CustomLog /var/log/httpd/aodh_access.log combined + -The ``etc/apache2/aodh`` file contains example settings that -work with a copy of Aodh installed via devstack. + WSGISocketPrefix /var/run/httpd -.. literalinclude:: ../../../etc/apache2/aodh -1. On deb-based systems copy or symlink the file to - ``/etc/apache2/sites-available``. For rpm-based systems the file will go in - ``/etc/httpd/conf.d``. - -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 +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. diff --git a/etc/apache2/aodh b/etc/apache2/aodh deleted file mode 100644 index d90d31896..000000000 --- a/etc/apache2/aodh +++ /dev/null @@ -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 - - - WSGIDaemonProcess aodh-api processes=2 threads=10 user=SOMEUSER display-name=%{GROUP} - WSGIProcessGroup aodh-api - WSGIScriptAlias / /var/www/aodh/app - WSGIApplicationGroup %{GLOBAL} - = 2.4> - ErrorLogFormat "%{cu}t %M" - - ErrorLog /var/log/httpd/aodh_error.log - CustomLog /var/log/httpd/aodh_access.log combined - - -WSGISocketPrefix /var/run/httpd