[Debconf-video-commits] r394 - in package/branches/pycon09: debian src/pyconvideo

[benh at alioth.debian.org]

Author: benh
Date: 2009-03-26 17:11:20 +0000 (Thu, 26 Mar 2009)
New Revision: 394

Modified:
   package/branches/pycon09/debian/pyconvideo.site
   package/branches/pycon09/src/pyconvideo/settings.py
   package/branches/pycon09/src/pyconvideo/urls.py
Log:
Map media and login URLs.


Modified: package/branches/pycon09/debian/pyconvideo.site
===================================================================
--- package/branches/pycon09/debian/pyconvideo.site	2009-03-26 16:05:05 UTC (rev 393)
+++ package/branches/pycon09/debian/pyconvideo.site	2009-03-26 17:11:20 UTC (rev 394)
@@ -4,4 +4,12 @@
     SetEnv DJANGO_SETTINGS_MODULE pyconvideo.settings
     PythonPath "['/usr/share/debconf-video-store'] + sys.path"
     PythonDebug On
+    <Location /media>
+        SetHandler None
+    </Location>
+    Alias /media /usr/share/debconf-video-store/media
+    <Location /admin/media>
+        SetHandler None
+    </Location>
+    Alias /admin/media /usr/share/python-support/python-django/django/contrib/admin/media
 </VirtualHost>

Modified: package/branches/pycon09/src/pyconvideo/settings.py
===================================================================
--- package/branches/pycon09/src/pyconvideo/settings.py	2009-03-26 16:05:05 UTC (rev 393)
+++ package/branches/pycon09/src/pyconvideo/settings.py	2009-03-26 17:11:20 UTC (rev 394)
@@ -37,17 +37,17 @@
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
+MEDIA_ROOT = '/usr/share/debconf-video-store/media'
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = ''
+MEDIA_URL = '/media/'
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
+ADMIN_MEDIA_PREFIX = '/admin/media/'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '1j4@@_fm$7-$72*k2@#t4je4yfd)ccy))rjok3_zj&x$aoeljj'

Modified: package/branches/pycon09/src/pyconvideo/urls.py
===================================================================
--- package/branches/pycon09/src/pyconvideo/urls.py	2009-03-26 16:05:05 UTC (rev 393)
+++ package/branches/pycon09/src/pyconvideo/urls.py	2009-03-26 17:11:20 UTC (rev 394)
@@ -30,4 +30,5 @@
     (r'^target/$', views.list_targets),
     (r'^target/(\d+)/review$', views.review_target),
     (r'^admin/(.*)', admin.site.root),
+    (r'^accounts/login/$', 'django.contrib.auth.views.login'),
 )