diff options
| author | Martin Green <martin.speleo@gmail.com> | 2011-05-02 02:37:33 +0100 |
|---|---|---|
| committer | Martin Green <martin.speleo@gmail.com> | 2011-05-02 02:37:33 +0100 |
| commit | 9becad0d9ae8d2704a7c6eb3859f15ff6f985b7b (patch) | |
| tree | a6531bf6fde88b061403e9d4ac4a9af7ef1507e9 | |
| parent | 4a3ccc728b1d8f0a48de98936858b7f16fc8abd2 (diff) | |
| download | troggle-9becad0d9ae8d2704a7c6eb3859f15ff6f985b7b.tar.gz troggle-9becad0d9ae8d2704a7c6eb3859f15ff6f985b7b.tar.bz2 troggle-9becad0d9ae8d2704a7c6eb3859f15ff6f985b7b.zip | |
Added ability to host website not at the root, eg. http://m.com/troggle/
| -rw-r--r-- | localsettingsserver.py | 3 | ||||
| -rw-r--r-- | localsettingsubuntu.py | 5 | ||||
| -rw-r--r-- | localsettingswindows.py | 4 | ||||
| -rw-r--r-- | urls.py | 7 |
4 files changed, 14 insertions, 5 deletions
diff --git a/localsettingsserver.py b/localsettingsserver.py index cd05178..1cde267 100644 --- a/localsettingsserver.py +++ b/localsettingsserver.py @@ -30,9 +30,10 @@ MEDIA_ROOT = '/home/expo/troggle/media/' MEDIA_ADMIN_DIR = '/usr/lib/python2.4/site-packages/django/contrib/admin/media/' URL_ROOT = "http://troggle.cavingexpedition.com/" +DIR_ROOT = ''#this should end in / if a value is given TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' -TINY_MCE_MEDIA_URL = URL_ROOT + 'tinymce_media/' +TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/' TEMPLATE_DIRS = ( "/home/expo/troggle/templates", diff --git a/localsettingsubuntu.py b/localsettingsubuntu.py index 991a77f..0d1fe62 100644 --- a/localsettingsubuntu.py +++ b/localsettingsubuntu.py @@ -30,14 +30,15 @@ PHOTOS = '/home/goatchurch/expoweb/photos' FILES = "/home/goatchurch/tunnel/cucc/surveys" -MEDIA_URL = '/site_media/' +MEDIA_URL = URL_ROOT + DIR_ROOT + '/site_media/' #URL_ROOT = '/troggle/' MEDIA_ROOT = '/home/goatchurch/expoweb/troggle/media/' URL_ROOT = 'http://127.0.0.1:8000' +DIR_ROOT = ''#this should end in / if a value is given TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' -TINY_MCE_MEDIA_URL = URL_ROOT + 'tinymce_media/' +TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/' TEMPLATE_DIRS = ( "/home/goatchurch/expoweb/troggle/templates", diff --git a/localsettingswindows.py b/localsettingswindows.py index 3b0447e..168a39a 100644 --- a/localsettingswindows.py +++ b/localsettingswindows.py @@ -18,14 +18,16 @@ LOGFILE = EXPOWEB+'troggle\\parsing_log.txt' PHOTOS = 'C:\\Expo\\expoweb\\photos'
URL_ROOT = 'http://127.0.0.1:8000'
+DIR_ROOT = ''#this should end in / if a value is given
PUBLIC_SITE = False
TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/'
-TINY_MCE_MEDIA_URL = URL_ROOT + 'tinymce_media/'
+TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/'
PYTHON_PATH = 'C:\\expoweb\\troggle\\'
MEDIA_ROOT = 'C:/Expo/expoweb/troggle/media/'
+MEDIA_URL = URL_ROOT + DIR_ROOT + 'site_media/'
#FILES = "http://framos.lawoftheland.co.uk/troggle/survey_files/"
@@ -15,7 +15,7 @@ admin.autodiscover() # type url probably means it's used.
-urlpatterns = patterns('',
+actualurlpatterns = patterns('',
url(r'^$', views_other.frontpage, name="frontpage"),
url(r'^todo/$', views_other.todo, name="todo"),
@@ -128,3 +128,8 @@ urlpatterns = patterns('', #url(r'^trip_report/?$',views_other.tripreport,name="trip_report")
)
+
+#Allow prefix to all urls
+urlpatterns = patterns ('',
+ ('^%s' % settings.DIR_ROOT, include(actualurlpatterns))
+)
|