summaryrefslogtreecommitdiffstats
path: root/localsettingsubuntu.py
diff options
context:
space:
mode:
authorexpo <expo@expobox.potato.hut>2012-08-05 02:33:48 +0200
committerexpo <expo@expobox.potato.hut>2012-08-05 02:33:48 +0200
commit0785455bac092d060cdb7e92fb16fd3e35bedcd2 (patch)
treeae4c978b878b84ad0fafc1201ed9ced76f7ecf91 /localsettingsubuntu.py
parent742848409bac99c713a6edce03d6705be1834bac (diff)
downloadtroggle-0785455bac092d060cdb7e92fb16fd3e35bedcd2.tar.gz
troggle-0785455bac092d060cdb7e92fb16fd3e35bedcd2.tar.bz2
troggle-0785455bac092d060cdb7e92fb16fd3e35bedcd2.zip
FIx base template so admin link, expoweb link work and use consistent base URL
Diffstat (limited to 'localsettingsubuntu.py')
-rw-r--r--localsettingsubuntu.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/localsettingsubuntu.py b/localsettingsubuntu.py
index 0a1d5e8..420d06a 100644
--- a/localsettingsubuntu.py
+++ b/localsettingsubuntu.py
@@ -29,18 +29,18 @@ FILES = REPOS_ROOT_PATH + 'expoimages'
PYTHON_PATH = '/home/expo/expofiles/troggle/'
#URL_ROOT = 'http://127.0.0.1:8000'
-URL_ROOT = "http://expobox/"
+URL_ROOT = "http://expoweb/"
DIR_ROOT = ''#this should end in / if a value is given
-EXPOWEB_URL = 'http://expobox/'
-SURVEYS_URL = 'http://expobox/survey_scans/'
+EXPOWEB_URL = '/'
+SURVEYS_URL = '/survey_scans/'
MEDIA_URL = URL_ROOT + DIR_ROOT + '/site_media/'
MEDIA_ROOT = '/home/expo/expofiles/troggle/media/'
MEDIA_ADMIN_DIR = '/usr/lib/python2.4/site-packages/django/contrib/admin/media/'
TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/'
-TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/'
+TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + '/tinymce_media/'
TEMPLATE_DIRS = (
"/home/expo/expofiles/troggle/templates",