Use REPOS_ROOT_PATH so there is just one place to change paths

localsettingspotatohut.py

@@ -1,9 +1,4 @@
 import sys
-sys.path.append("/home/expo/troggle")
-
-# This is an example file. Copy it to localsettings.py, set the
-# password and _don't_ check that file back to the repo as it exposes 
-# your/our password to the world!
 
 DATABASES = {
     'default': {
@@ -22,36 +17,35 @@ sys.path.append(REPOS_ROOT_PATH + 'troggle')
 
 PUBLIC_SITE = True
 
-SURVEX_DATA = '/home/expo/loser/'
+SURVEX_DATA = REPOS_ROOT_PATH + 'loser/'
-TUNNEL_DATA = '/home/expo/tunneldata/'
+TUNNEL_DATA = REPOS_ROOT_PATH + 'tunneldata/'
 
 CAVERN = 'cavern'
 THREEDTOPOS = '3dtopos'
-EXPOWEB = '/home/expo/expoweb/'
+EXPOWEB = REPOS_ROOT_PATH + 'expoweb/'
-SURVEYS = '/home/expo/'
+SURVEYS = REPOS_ROOT_PATH
-SURVEY_SCANS = '/home/expo/expoimages/'
+SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/'
-FILES = '/home/expo/expoimages'
+FILES = REPOS_ROOT_PATH + 'expoimages'
 
-EXPOWEB_URL = 'http://expo/'
-
-SURVEYS_URL = 'http://expo/survey_scans/'
 
 PYTHON_PATH = '/home/expo/troggle/'
 
-#URL_ROOT = "http://troggle.cavingexpedition.com/"
+URL_ROOT = "http://expo/"
-URL_ROOT = "http://expo.survex.com/"
 DIR_ROOT = ''#this should end in / if a value is given
-
+EXPOWEB_URL = 'http://expo/'
+SURVEYS_URL = 'http://expo/survey_scans/'
 MEDIA_URL = '/' + DIR_ROOT + 'site_media/'
 
-MEDIA_ROOT = '/home/expo/troggle/media/'
+MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/'
-MEDIA_ADMIN_DIR = '/usr/lib/python2.4/site-packages/django/contrib/admin/media/'
+MEDIA_ADMIN_DIR = '/usr/lib/python2.7/site-packages/django/contrib/admin/media/'
+
+JSLIB_PATH = /usr/share/javascript/
 
 TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/'
 TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/'
 
 TEMPLATE_DIRS = (
-    "/home/expo/troggle/templates",
+    PYTHON_PATH + "templates",
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.

localsettingsserver.py

@@ -1,6 +1,4 @@
 import sys
-sys.path.append("/home/expo/troggle")
-
 # This is an example file. Copy it to localsettings.py, set the
 # password and _don't_ check that file back to the repo as it exposes 
 # your/our password to the world!
@@ -22,36 +20,35 @@ sys.path.append(REPOS_ROOT_PATH + 'troggle')
 
 PUBLIC_SITE = True
 
-SURVEX_DATA = '/home/expo/loser/'
+SURVEX_DATA = REPOS_ROOT_PATH + 'loser/'
-TUNNEL_DATA = '/home/expo/tunneldata/'
+TUNNEL_DATA = REPOS_ROOT_PATH + 'tunneldata/'
 
 CAVERN = 'cavern'
 THREEDTOPOS = '3dtopos'
-EXPOWEB = '/home/expo/expoweb/'
+EXPOWEB = REPOS_ROOT_PATH + 'expoweb/'
-SURVEYS = '/home/expo/'
+SURVEYS = REPOS_ROOT_PATH
-SURVEY_SCANS = '/home/expo/expoimages/'
+SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/'
-FILES = '/home/expo/expoimages'
+FILES = REPOS_ROOT_PATH + 'expoimages'
 
-EXPOWEB_URL = 'http://expo.survex.com/'
 
-SURVEYS_URL = 'http://expo.survex.com/survey_scans/'
+PYTHON_PATH = REPOS_ROOT_PATH + 'troggle/'
 
-PYTHON_PATH = '/home/expo/troggle/'
-
-#URL_ROOT = "http://troggle.cavingexpedition.com/"
 URL_ROOT = "http://expo.survex.com/"
 DIR_ROOT = ''#this should end in / if a value is given
-
+EXPOWEB_URL = 'http://expo.survex.com/'
+SURVEYS_URL = 'http://expo.survex.com/survey_scans/'
 MEDIA_URL = URL_ROOT + DIR_ROOT + 'site_media/'
 
-MEDIA_ROOT = '/home/expo/troggle/media/'
+MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/'
-MEDIA_ADMIN_DIR = '/usr/lib/python2.4/site-packages/django/contrib/admin/media/'
+MEDIA_ADMIN_DIR = '/usr/lib/python2.7/site-packages/django/contrib/admin/media/'
+
+JSLIB_PATH = /usr/share/javascript/
 
 TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/'
 TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/'
 
 TEMPLATE_DIRS = (
-    "/home/expo/troggle/templates",
+    PYTHON_PATH + "templates",
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.

localsettingsubuntu.py

@@ -6,7 +6,7 @@ DATABASES = {
         'ENGINE': 'django.db.backends.mysql', # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'NAME' : 'troggle',     # Or path to database file if using sqlite3.
         'USER' : 'expo',        # Not used with sqlite3.
-        'PASSWORD' : 'gosser',  # Not used with sqlite3.
+        'PASSWORD' : '161:gosser',  # Not used with sqlite3.
         'HOST' : '',            # Set to empty string for localhost. Not used with sqlite3.
         'PORT' : '',            # Set to empty string for default. Not used with sqlite3.
     }
@@ -29,6 +29,8 @@ SURVEYS = REPOS_ROOT_PATH
 SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/'
 FILES = REPOS_ROOT_PATH + 'expoimages'
 
+EXPOWEB_URL = '/'
+SURVEYS_URL = '/survey_scans/'
 
 PYTHON_PATH = REPOS_ROOT_PATH + 'troggle/'
 
@@ -36,13 +38,14 @@ PYTHON_PATH = REPOS_ROOT_PATH + 'troggle/'
 URL_ROOT = "http://expoweb/"
 DIR_ROOT = ''#this should end in / if a value is given
 
-EXPOWEB_URL = '/'
+
-SURVEYS_URL = '/survey_scans/'
 
 MEDIA_URL = URL_ROOT + DIR_ROOT + '/site_media/'
 MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/'
 MEDIA_ADMIN_DIR = '/usr/lib/python2.4/site-packages/django/contrib/admin/media/'
 
+JSLIB_PATH = /usr/share/javascript/
+
 TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/'
 TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + '/tinymce_media/'
 
@@ -53,4 +56,4 @@ TEMPLATE_DIRS = (
     # Don't forget to use absolute paths, not relative paths.
 )
 
-LOGFILE = PYTHON_PATH + 'parsing_log.txt'
+LOGFILE = PYTHON_PATH + 'troggle_log.txt'