Ticket #9970: wsgi-docs.diff

docs/howto/deployment/index.txt

@@ -12 +12 @@
    :maxdepth: 1
    
    modpython
+   modwsgi
    fastcgi
    
-:ref:`Deploying under mod_python <howto-deployment-modpython>` is the
-recommended deployment method; start there if you're not sure which path you'd
-like to go down.
+Deploying under either :ref:`mod_python <howto-deployment-modpython>` or 
+:ref:`mod_wsgi <howto-deployment-modwsgi>` is the recommended deployment method;
+start with one them if you're not sure which path you'd like to go down.
 
 .. seealso::
 
     * `Chapter 20 of The Django Book`_ discusses deployment and especially
       scaling in more detail.
       
-    * `mod_wsgi`_ is a newcomer to the Python deployment world, but it's rapidly
-      gaining traction. Currently there's a few hoops you have to jump through to
-      `use mod_wsgi with Django`_, but mod_wsgi tends to get rave reviews from
-      those who use it.
-
 .. _chapter 20 of the django book: http://djangobook.com/en/1.0/chapter20/
-.. _mod_wsgi: http://code.google.com/p/modwsgi/
-.. _use mod_wsgi with Django: http://code.google.com/p/modwsgi/wiki/IntegrationWithDjango
- No newline at end of file

new file docs/howto/deployment/modwsgi.txt

@@ +1 @@
+.. _howto-deployment-modwsgi:
+
+==========================================
+How to use Django with Apache and mod_wsgi
+==========================================
+
+Apache_ with `mod_wsgi`_ is one of the reccomended ways for using Django in 
+production.
+
+.. _Apache: http://httpd.apache.org/
+.. _mod_wsgi: http://code.google.com/p/modwsgi/
+
+mod_wsgi is an Apache module which can be used to host any Python application 
+which supports the Python WSGI interface (`PEP 333`_), including Django.  Django 
+will work with any version of Apache which supports mod_wsgi.
+
+.. _PEP 333: http://www.python.org/dev/peps/pep-0333/
+
+Basic Configuration
+===================
+
+First make sure you have Apache installed, and mod_wsgi installed and activated.  
+Next edit your ``httpd.conf`` file and add::
+
+    WSGIScriptAlias / /usr/local/django/mysite/apache/django.wsgi
+
+Where the first path is the url you want to be serving your application at (/ 
+indicates the root url), and the second is the location of a WSGI file (to be 
+explained momentarily) on your system, usually inside of your project.  This 
+will tell Apache to serve any request at that URL using WSGI, configured with 
+that file.  Next we create our WSGI file, at the location we just indicated and 
+put in it::
+
+    import os
+    import sys
+
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'mysite.settings'
+
+    import django.core.handlers.wsgi
+    application = django.core.handlers.wsgi.WSGIHandler()
+
+If your project is not on your PYTHONPATH by default you can add::
+
+    sys.path.append('/usr/local/django')
+
+to place it on the path.  Also replace 'mysite.settings' with your settings file.
+
+See the :ref:`Apache/mod_python documentation<howto-deployment-modpython>` for 
+directions on serving static media, and the `mod_wsgi documentation`_ for an 
+explanation of other directives and configuration options you can use.
+
+.. _mod_wsgi documentation: http://code.google.com/p/modwsgi/wiki/IntegrationWithDjango
+ No newline at end of file

docs/index.txt

@@ -73 +73 @@
     * **Settings:** :ref:`Overview <topics-settings>` | :ref:`Full list of settings <ref-settings>`
     * **django-admin.py and manage.py:** :ref:`Overview <ref-django-admin>` | :ref:`Adding custom commands <howto-custom-management-commands>`
     * **Testing:** :ref:`Overview <topics-testing>`
-    * **Deployment:** :ref:`Overview <howto-deployment-index>` | :ref:`Apache/mod_python <howto-deployment-modpython>` | :ref:`FastCGI/SCGI/AJP <howto-deployment-fastcgi>` | :ref:`Apache authentication <howto-apache-auth>` | :ref:`Serving static files <howto-static-files>` | :ref:`Tracking code errors by e-mail <howto-error-reporting>`
+    * **Deployment:** :ref:`Overview <howto-deployment-index>` | :ref:`Apache/mod_python <howto-deployment-modpython>` | :ref:`Apache/mod_wsgi <howto-deployment-modwsgi>` | :ref:`FastCGI/SCGI/AJP <howto-deployment-fastcgi>` | :ref:`Apache authentication <howto-apache-auth>` | :ref:`Serving static files <howto-static-files>` | :ref:`Tracking code errors by e-mail <howto-error-reporting>`
 
 Other batteries included
 ========================