summaryrefslogtreecommitdiffstats
path: root/localsettingsserver.py
diff options
context:
space:
mode:
authorMartin Green <martin.speleo@gmail.com>2011-05-02 02:37:33 +0100
committerMartin Green <martin.speleo@gmail.com>2011-05-02 02:37:33 +0100
commitcdf54e0f9bf2baf0df691a576c69fb906b808214 (patch)
treea568ad043ca7ed19d688e5bf8a671b1e4f927d52 /localsettingsserver.py
parentb439d401207a81dbb422180f9d17e421b7eaadc4 (diff)
downloadtroggle-cdf54e0f9bf2baf0df691a576c69fb906b808214.tar.gz
troggle-cdf54e0f9bf2baf0df691a576c69fb906b808214.tar.bz2
troggle-cdf54e0f9bf2baf0df691a576c69fb906b808214.zip
Added ability to host website not at the root, eg. http://m.com/troggle/
Diffstat (limited to 'localsettingsserver.py')
-rw-r--r--localsettingsserver.py3
1 files changed, 2 insertions, 1 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",