From 516051bfd2b537f441c46359cce7eacbf15fc4b8 Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Tue, 31 Mar 2009 23:34:03 +0000 Subject: A whole lotta documentation fixes: Fixes #8704, #8826, #8980, #9243, #9343, #9529, git-svn-id: http://code.djangoproject.com/svn/django/trunk@10303 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/howto/deployment/fastcgi.txt | 13 +++++++++++++ docs/howto/deployment/index.txt | 1 + docs/howto/deployment/modpython.txt | 4 ++++ docs/howto/static-files.txt | 6 +++++- 4 files changed, 23 insertions(+), 1 deletion(-) (limited to 'docs/howto') diff --git a/docs/howto/deployment/fastcgi.txt b/docs/howto/deployment/fastcgi.txt index 2049cacf2a..c29fa17d9a 100644 --- a/docs/howto/deployment/fastcgi.txt +++ b/docs/howto/deployment/fastcgi.txt @@ -288,6 +288,19 @@ You can also run multiple Django installations on the same site simply by specifying multiple entries in the ``fastcgi.server`` directive. Add one FastCGI host for each. +Cherokee setup +============== + +Cherokee is a very fast, flexible and easy to configure Web Server. It +supports the widespread technologies nowadays: FastCGI, SCGI, PHP, CGI, SSI, +TLS and SSL encrypted connections, Virtual hosts, Authentication, on the fly +encoding, Load Balancing, Apache compatible log files, Data Base Balancer, +Reverse HTTP Proxy and much more. + +The Cherokee project provides a documentation to `setting up Django`_ with Cherokee. + +.. _setting up Django: http://www.cherokee-project.com/doc/cookbook_django.html + Running Django on a shared-hosting provider with Apache ======================================================= diff --git a/docs/howto/deployment/index.txt b/docs/howto/deployment/index.txt index 31efa14b29..af1d640c84 100644 --- a/docs/howto/deployment/index.txt +++ b/docs/howto/deployment/index.txt @@ -13,6 +13,7 @@ ways to easily deploy Django: modwsgi modpython + modwsgi fastcgi If you're new to deploying Django and/or Python, we'd recommend you try diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt index 14f0219421..3c3af82ec4 100644 --- a/docs/howto/deployment/modpython.txt +++ b/docs/howto/deployment/modpython.txt @@ -215,8 +215,10 @@ 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, here's how you can turn off mod_python for a @@ -249,8 +251,10 @@ the ``media`` subdirectory and any URL that ends with ``.jpg``, ``.gif`` or .. _lighttpd: http://www.lighttpd.net/ +.. _Nginx: http://wiki.codemongers.com/Main .. _TUX: http://en.wikipedia.org/wiki/TUX_web_server .. _Apache: http://httpd.apache.org/ +.. _Cherokee: http://www.cherokee-project.com/ .. _howto-deployment-modpython-serving-the-admin-files: diff --git a/docs/howto/static-files.txt b/docs/howto/static-files.txt index bff472fc3f..a5e069f6f0 100644 --- a/docs/howto/static-files.txt +++ b/docs/howto/static-files.txt @@ -10,7 +10,7 @@ How to serve static files Django itself doesn't serve static (media) files, such as images, style sheets, or video. It leaves that job to whichever Web server you choose. -The reasoning here is that standard Web servers, such as Apache_ and lighttpd_, +The reasoning here is that standard Web servers, such as Apache_, lighttpd_ and Cherokee_, are much more fine-tuned at serving static files than a Web application framework. @@ -19,6 +19,7 @@ use the :func:`django.views.static.serve` view to serve media files. .. _Apache: http://httpd.apache.org/ .. _lighttpd: http://www.lighttpd.net/ +.. _Cherokee: http://www.cherokee-project.com/ The big, fat disclaimer ======================= @@ -72,6 +73,9 @@ required. For example, if we have a line in ``settings.py`` that says:: (r'^site_media/(?P.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_DOC_ROOT}), +Be careful not to use the same path as your :setting:`ADMIN_MEDIA_PREFIX` (which defaults +to ``/media/``) as this will overwrite your URLconf entry. + Directory listings ================== -- cgit v1.3