update localsettings for server and expo machine

1 files changed, 16 insertions, 8 deletions

diff --git a/localsettingsserver.py b/localsettingsserver.py
index 7e7a67f..fd59ea6 100644
--- a/localsettingsserver.py
+++ b/localsettingsserver.py
@@ -8,31 +8,39 @@ DATABASE_PASSWORD = 'aiGohsh5'         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
 
+REPOS_ROOT_PATH =  '/home/expo/'
+sys.path.append(REPOS_ROOT_PATH)
+sys.path.append(REPOS_ROOT_PATH + 'troggle')
+
+PUBLIC_SITE = True
+
 SURVEX_DATA = '/home/expo/loser/'
+TUNNEL_DATA = '/home/expo/tunneldata/'
+
 CAVERN = 'cavern'
 THREEDTOPOS = '3dtopos'
 EXPOWEB = '/home/expo/expoweb/'
 SURVEYS = '/home/expo/'
 SURVEY_SCANS = '/home/expo/expoimages/'
 FILES = '/home/expo/expoimages'
-EXPOWEB_URL = 'http://expo.survex.com/'
 
-PUBLIC_SITE = True
+EXPOWEB_URL = 'http://expo.survex.com/'
 
-SURVEYS_URL = 'http://troggle.cavingexpedition.com/survey_scans/'
+MMMMC_DIR = "/home/expo/mmmc"
 
-SVX_URL = 'http://framos.lawoftheland.co.uk/troggle/survex/'
+SURVEYS_URL = 'http://expo.survex.com/survey_scans/'
 
 PYTHON_PATH = '/home/expo/troggle/'
 
-MEDIA_URL = 'http://troggle.cavingexpedition.com/site_media/'
+#URL_ROOT = "http://troggle.cavingexpedition.com/"
+URL_ROOT = "http://expo.survex.com/"
+DIR_ROOT = ''#this should end in / if a value is given
+
+MEDIA_URL = URL_ROOT + DIR_ROOT + 'site_media/'
 
 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 + DIR_ROOT + 'tinymce_media/'