From 0869bce045c67749793f61da93caf2ad713ae60e Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Sun, 3 Jun 2012 18:46:29 +0200 Subject: [PATCH] adapt the exemplary apache vhost configs for Django 1.4 --- etc/apache2/dedicated_vhost.conf | 9 +-------- etc/apache2/shared_vhost.conf | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/etc/apache2/dedicated_vhost.conf b/etc/apache2/dedicated_vhost.conf index b7ad45f..a794c4d 100644 --- a/etc/apache2/dedicated_vhost.conf +++ b/etc/apache2/dedicated_vhost.conf @@ -8,17 +8,10 @@ ServerName example.com ServerAlias www.example.com + Alias /static/admin/ /usr/share/pyshared/django/contrib/admin/static/admin/ Alias /static/ /srv/mumble-django/htdocs/ Alias /mumble/media/ /srv/mumble-django/pyweb/mumble/media/ - # for Debian squeeze(unstable) - Alias /media/ /usr/share/pyshared/django/contrib/admin/media/ - # if installed using easy_install - #Alias /media/ /usr/lib/python2.5/site-packages/Django-1.2.3-py2.5.egg/django/contrib/admin/media/ - # if self-installed using setup.py - #Alias /media/ /usr/lib/python2.4/site-packages/django/contrib/admin/media/ - #Alias /media/ /usr/lib/python2.5/site-packages/django/contrib/admin/media/ - WSGIScriptAlias / /srv/mumble-django/mumble-django.wsgi WSGIDaemonProcess mumble-django threads=25 WSGIProcessGroup mumble-django diff --git a/etc/apache2/shared_vhost.conf b/etc/apache2/shared_vhost.conf index d0ec99e..4c6de7a 100644 --- a/etc/apache2/shared_vhost.conf +++ b/etc/apache2/shared_vhost.conf @@ -17,17 +17,10 @@ # -----------8<--------- cut here + Alias /mumble-django/static/admin/ /usr/share/pyshared/django/contrib/admin/static/admin/ Alias /mumble-django/static/ /srv/mumble-django/htdocs/ Alias /mumble-django/mumble/media/ /srv/mumble-django/pyweb/mumble/media/ - # for Debian squeeze(unstable) - Alias /mumble-django/media/ /usr/share/pyshared/django/contrib/admin/media/ - # if installed using easy_install - #Alias /media/ /usr/lib/python2.5/site-packages/Django-1.2.3-py2.5.egg/django/contrib/admin/media/ - # if self-installed using setup.py - #Alias /mumble-django/media/ /usr/lib/python2.4/site-packages/django/contrib/admin/media/ - #Alias /mumble-django/media/ /usr/lib/python2.5/site-packages/django/contrib/admin/media/ - WSGIScriptAlias /mumble-django /srv/mumble-django/mumble-django.wsgi WSGIDaemonProcess mumble-django threads=25 WSGIProcessGroup mumble-django