summaryrefslogtreecommitdiff
path: root/config/base_urls.py
diff options
context:
space:
mode:
authorluxagraf <sng@luxagraf.net>2012-10-15 15:57:47 +0000
committerluxagraf <sng@luxagraf.net>2012-10-15 15:57:47 +0000
commit3b356bf9170317181313e2aa7e622490f69d61fe (patch)
tree4e49590889481c7e13274cf32cd9eb31a47e3d8a /config/base_urls.py
parentde05241d91a324f1eb7167433c3a06a4dcf01ba1 (diff)
changed settings for remote server
Diffstat (limited to 'config/base_urls.py')
-rw-r--r--config/base_urls.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/config/base_urls.py b/config/base_urls.py
index b2cd642..201a621 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -24,14 +24,10 @@ feeds = {
'fblinks' : LatestLinks,
}
-if settings.DEVELOPMENT:
- urlpatterns = patterns('',
+urlpatterns = patterns('',
(r'^media/admin/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT+'/admin'}),
- (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
- (r'^images/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.IMAGES_ROOT}),
- )
-else:
- urlpatterns = patterns('')
+ (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
+)
# old page redirects
urlpatterns += patterns('',
@@ -70,3 +66,9 @@ urlpatterns += patterns('',
(r'^(?P<slug>[-\w]+)/$', 'pages.views.page'),
)
+
+urlpatterns += patterns('',
+ url(r'^static/(?P<path>.*)$', 'django.views.static.serve',
+ {'document_root': settings.STATIC_ROOT,}
+ ),
+)