From 5be508620ef4cb9e106c75548f56c8bbb314c26d Mon Sep 17 00:00:00 2001
From: ExpoOnServer <devnull@localhost>
Date: Thu, 14 Jul 2011 03:50:49 +0100
Subject: [PATCH] update localsettings for server and expo machine

---
 localsettingsserver.py | 24 ++++++++++++++++--------
 localsettingsubuntu.py | 39 ++++++++++++++++++++-------------------
 2 files changed, 36 insertions(+), 27 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
+MMMMC_DIR = "/home/expo/mmmc"
 
-SURVEYS_URL = 'http://troggle.cavingexpedition.com/survey_scans/'
-
-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/'
 
diff --git a/localsettingsubuntu.py b/localsettingsubuntu.py
index 63e3ce6..79d5db9 100644
--- a/localsettingsubuntu.py
+++ b/localsettingsubuntu.py
@@ -1,4 +1,4 @@
-# this file is copied from localsettingsserver.py or localsettingsubuntu.py to get you set off
+# link localsettings to this file for use on expo computer in austria
 
 DATABASE_ENGINE = 'mysql'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
 DATABASE_NAME = 'troggle'             # Or path to database file if using sqlite3.
@@ -6,37 +6,37 @@ DATABASE_USER = 'troggler3'             # Not used with sqlite3.
 DATABASE_PASSWORD = 'ggg'         # 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.
-PYTHON_PATH = '/home/goatchurch/expoweb/troggle/'
 
-SURVEX_DATA = '/home/goatchurch/tunnel/cucc/loser/'
-SURVEYS = '/home/goatchurch/tunnel/cucc/surveys'
+REPOS_ROOT_PATH = '/home/expo/expofiles/'
 
-EXPOWEB_URL = 'http://expo.survex.com/'
+sys.path.append(REPOS_ROOT_PATH)
+sys.path.append(REPOS_ROOT_PATH + 'troggle')
 
 PUBLIC_SITE = False
 
+SURVEX_DATA = REPOS_ROOT_PATH + 'loser/'
+TUNNEL_DATA = REPOS_ROOT_PATH + 'tunneldata/'
+
 CAVERN = 'cavern'
 THREEDTOPOS = '3dtopos'
-EXPOWEB = '/home/goatchurch/expoweb/'
-SURVEYS_URL = ''
+EXPOWEB = REPOS_ROOT_PATH + 'expoweb/'
+SURVEYS = '/home/expo/'
+SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/'
+FILES = REPOS_ROOT_PATH + 'expoimages'
 
-SURVEY_SCANS = '/home/goatchurch/tunnel/cucc/surveys/surveyscans'
 
-LOGFILE = '/home/goatchurch/expoweb/parsing_log.txt'
+PYTHON_PATH = '/home/expo/expofiles/troggle/'
 
-PHOTOS = '/home/goatchurch/expoweb/photos'
-
-# going to survey files (needs better name)
-#FILES = "http://framos.lawoftheland.co.uk/troggle/survey_files/"
-FILES = "/home/goatchurch/tunnel/cucc/surveys"
+#URL_ROOT = 'http://127.0.0.1:8000'
+URL_ROOT = "http://expobox/"
+DIR_ROOT = ''#this should end in / if a value is given
 
+EXPOWEB_URL = 'http://expobox/'
+SURVEYS_URL = 'http://expobox/survey_scans/'
 
 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
+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/'
@@ -48,3 +48,4 @@ TEMPLATE_DIRS = (
     # Don't forget to use absolute paths, not relative paths.
 )
 
+LOGFILE = '/home/expo/expofiles/expoweb/parsing_log.txt'