diff options
| -rw-r--r-- | localsettingsserver.py | 7 | ||||
| -rw-r--r-- | settings.py | 10 | ||||
| -rw-r--r-- | urls.py | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/localsettingsserver.py b/localsettingsserver.py index 22d55be..9030d5b 100644 --- a/localsettingsserver.py +++ b/localsettingsserver.py @@ -9,6 +9,13 @@ SURVEX_DATA = '' CAVERN = 'cavern' EXPOWEB = '/home/mjg/expoweb' +# 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 = 'http://framos.lawoftheland.co.uk/troggle/site_media/' + +SVX_URL = 'http://framos.lawoftheland.co.uk/troggle/survex/' + PYTHON_PATH = '/home/mjg/expoweb/troggle/' URL_ROOT = "/" diff --git a/settings.py b/settings.py index 11e9073..b24f317 100644 --- a/settings.py +++ b/settings.py @@ -27,16 +27,6 @@ SITE_ID = 1 # to load the internationalization machinery. USE_I18N = True -# Absolute path to the directory that holds media. -# Example: "/home/media/media.lawrence.com/" -# MOVED TO LOCALSETTINGS - -# 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 = 'http://127.0.0.1:8000/troggle/site_media/' - -SVX_URL = 'http://127.0.0.1:8000/troggle/survex/' # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. @@ -29,7 +29,7 @@ urlpatterns = patterns('', (r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/(.*)', admin.site.root),
- (r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
+ (r'^troggle/site_media/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
)
|