diff options
| author | Loic Bistuer <loic.bistuer@gmail.com> | 2014-10-15 20:02:45 +0700 |
|---|---|---|
| committer | Loic Bistuer <loic.bistuer@gmail.com> | 2014-10-15 20:02:45 +0700 |
| commit | 4443c6f6d8e481db8142e79391ad0b65ebcf46e3 (patch) | |
| tree | 57a3700be91daabf602c6d1fba6536c39a0d1af4 /docs | |
| parent | 7a893ee77171d6cc37ffd40d67af6161633235e0 (diff) | |
| parent | 1b2debe89684724f0617bb89aa49cb70273ab0f1 (diff) | |
Merge pull request #3370 from collinanderson/ticket_23637
Fixed #23637 -- Removed TUX, lighttpd, and Cherokee as common.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/howto/deployment/wsgi/modwsgi.txt | 6 | ||||
| -rw-r--r-- | docs/howto/static-files/deployment.txt | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/docs/howto/deployment/wsgi/modwsgi.txt b/docs/howto/deployment/wsgi/modwsgi.txt index 17497a1abd..7d85052e3b 100644 --- a/docs/howto/deployment/wsgi/modwsgi.txt +++ b/docs/howto/deployment/wsgi/modwsgi.txt @@ -118,11 +118,8 @@ server you choose. We recommend using a separate Web server -- i.e., one that's not also running Django -- for serving media. Here are some good choices: -* lighttpd_ * Nginx_ -* TUX_ * A stripped-down version of Apache_ -* Cherokee_ If, however, you have no option but to serve media files on the same Apache ``VirtualHost`` as Django, you can set up Apache to serve some URLs as @@ -161,11 +158,8 @@ If you are using a version of Apache older than 2.4, replace ``Require all granted`` with ``Allow from all`` and also add the line ``Order deny,allow`` above it. -.. _lighttpd: http://www.lighttpd.net/ .. _Nginx: http://wiki.nginx.org/Main -.. _TUX: http://en.wikipedia.org/wiki/TUX_web_server .. _Apache: http://httpd.apache.org/ -.. _Cherokee: http://www.cherokee-project.com/ .. More details on configuring a mod_wsgi site to serve static files can be found .. in the mod_wsgi documentation on `hosting static files`_. diff --git a/docs/howto/static-files/deployment.txt b/docs/howto/static-files/deployment.txt index 865a5c6b41..a88403fda8 100644 --- a/docs/howto/static-files/deployment.txt +++ b/docs/howto/static-files/deployment.txt @@ -70,17 +70,11 @@ Most larger Django sites use a separate Web server -- i.e., one that's not also running Django -- for serving static files. This server often runs a different type of web server -- faster but less full-featured. Some common choices are: -* lighttpd_ * Nginx_ -* TUX_ -* Cherokee_ * A stripped-down version of Apache_ -.. _lighttpd: http://www.lighttpd.net/ .. _Nginx: http://wiki.nginx.org/Main -.. _TUX: http://en.wikipedia.org/wiki/TUX_web_server .. _Apache: http://httpd.apache.org/ -.. _Cherokee: http://www.cherokee-project.com/ Configuring these servers is out of scope of this document; check each server's respective documentation for instructions. |