summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-10-27 18:17:50 -0400
committerTim Graham <timograham@gmail.com>2014-10-27 18:20:18 -0400
commitb7231e39a41d1897e73832803e4ceeeda11615e5 (patch)
tree34cc2ad7326ce197cfcd6a010b364b3653c7e3e0
parentdea3eefa728df4c3919e7d5115af351ba28c6e7f (diff)
[1.7.x] Fixed #23708 -- Corrected mod_wsgi docs reference to nonexistent comment in wsgi.py.
Thanks inglesp for the report. Backport of e460b1c573 from master
-rw-r--r--docs/howto/deployment/wsgi/modwsgi.txt16
1 files changed, 11 insertions, 5 deletions
diff --git a/docs/howto/deployment/wsgi/modwsgi.txt b/docs/howto/deployment/wsgi/modwsgi.txt
index e0af9676f4..042555e4ac 100644
--- a/docs/howto/deployment/wsgi/modwsgi.txt
+++ b/docs/howto/deployment/wsgi/modwsgi.txt
@@ -61,12 +61,18 @@ should put in this file, and what else you can add to it.
.. warning::
- If multiple Django sites are run in a single mod_wsgi process, all of them
- will use the settings of whichever one happens to run first. This can be
- solved with a minor edit to ``wsgi.py`` (see comment in the file for
- details), or by :ref:`using mod_wsgi daemon mode<daemon-mode>` and ensuring
- that each site runs in its own daemon process.
+ If multiple Django sites are run in a single mod_wsgi process, all of them
+ will use the settings of whichever one happens to run first. This can be
+ solved by changing::
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ project_name }}.settings")
+
+ in ``wsgi.py``, to::
+
+ os.environ["DJANGO_SETTINGS_MODULE"] = "{{ project_name }}.settings"
+
+ or by :ref:`using mod_wsgi daemon mode<daemon-mode>` and ensuring that each
+ site runs in its own daemon process.
Using a virtualenv
==================