xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Added ability to host website not at the root, eg. http://m.com/troggle/

Browse Source
This commit is contained in:
Martin Green 2011-05-02 02:37:33 +01:00
parent 4a3ccc728b
commit 9becad0d9a
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
localsettingsserver.py
View File

@ -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",

5
localsettingsubuntu.py
View File

@ -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",

4
localsettingswindows.py
View File

@ -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/"

7
urls.py
View File

@ -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))
)