clean up settings and throw out that get_script_prefix() fakery from __init__.py, because I have the feeling that this stuff will blow something up horribly. runserver is able to handle MUMBLE_DJANGO_URL not being '/', so this can and must now be configured, period.

pyweb/__init__.py

@@ -13,16 +13,3 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
 """
-
-from django.core import signals
-
-def update_paths( **kwargs ):
-	from django.core.urlresolvers import get_script_prefix, reverse
-	from os.path     import join
-	from django.conf import settings
-	pf = get_script_prefix();
-	settings.MEDIA_URL          = "%sstatic" % pf;
-	settings.ADMIN_MEDIA_PREFIX = "%smedia"  % pf;
-	signals.request_started.disconnect( update_paths );
-
-signals.request_started.connect( update_paths );

pyweb/settings.py

@@ -18,6 +18,15 @@
 #################################################################
 #################################################################
 ##                                                             ##
+##  The path inside the VirtualHost that M-D lives in:         ##
+##                                                             ##
+MUMBLE_DJANGO_URL  = '/';                                      ##
+#MUMBLE_DJANGO_URL  = '/mumble-django/';                       ##
+##                                                             ##
+##  Make sure you use a trailing slash!                        ##
+##                                                             ##
+#################################################################
+##                                                             ##
 ##  Mumble-Django will try to auto-detect this value if it     ##
 ##  isn't set, which is the default. However, if this should   ##
 ##  not work as expected, set this to the path where you       ##
@@ -26,9 +35,11 @@
 ##  Default: Auto Detection                                    ##
 MUMBLE_DJANGO_ROOT = None;                                     ##
 ##  Examples:                                                  ##
-#MUMBLE_DJANGO_ROOT = '/home/mistagee/mumble-django';          ##
+#MUMBLE_DJANGO_ROOT = '/srv/mumble-django';                    ##
 #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django';                  ##
 ##                                                             ##
+#################################################################
+##                                                             ##
 ##  For a basic installation, this is all you need to edit in  ##
 ##  this file, the rest will be handled automatically!         ##
 ##                                                             ##
@@ -112,18 +123,20 @@ SITE_ID = 1
 # to load the internationalization machinery.
 USE_I18N = True
 
+
 # Absolute path to the directory that holds media.
 MEDIA_ROOT = join( MUMBLE_DJANGO_ROOT, 'htdocs' )
 
 # URL that handles the media served from MEDIA_ROOT.
-MEDIA_URL = '/static/'
+MEDIA_URL = MUMBLE_DJANGO_URL+'static/'
 
-# URL to the login view
+# URL prefix for admin media -- CSS, JavaScript and images.
+ADMIN_MEDIA_PREFIX = MUMBLE_DJANGO_URL+'media/'
+
+# URL to the login view - will be resolved on-demand
 from deferred_resolver import ViewResolver
 LOGIN_URL = ViewResolver( "django.contrib.auth.views.login" )
 
-# URL prefix for admin media -- CSS, JavaScript and images.
-ADMIN_MEDIA_PREFIX = '/media/'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'u-mp185msk#z4%s(do2^5405)y5d!9adbn92)apu_p^qvqh10v'
@@ -132,7 +145,6 @@ SECRET_KEY = 'u-mp185msk#z4%s(do2^5405)y5d!9adbn92)apu_p^qvqh10v'
 TEMPLATE_LOADERS = (
 	'django.template.loaders.filesystem.load_template_source',
 	'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
 )
 
 MIDDLEWARE_CLASSES = (

pyweb/urls.py

@@ -43,6 +43,8 @@ urlpatterns = patterns('',
 # Development stuff
 if settings.DEBUG:
 	urlpatterns += patterns('',
-		(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT, 'show_indexes': True} ),
+		(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:],
+		'django.views.static.serve',
+		{'document_root': settings.MEDIA_ROOT, 'show_indexes': True} ),
 	)