diff options
| author | ExpoOnServer <devnull@localhost> | 2011-07-14 03:50:49 +0100 |
|---|---|---|
| committer | ExpoOnServer <devnull@localhost> | 2011-07-14 03:50:49 +0100 |
| commit | 5be508620ef4cb9e106c75548f56c8bbb314c26d (patch) | |
| tree | 5ad9d231a2c86cb8dd8426c46f976ad274cbe044 /localsettingsubuntu.py | |
| parent | 82e968d5c7eb24e12bc68771420310837dba1f7b (diff) | |
| download | troggle-5be508620ef4cb9e106c75548f56c8bbb314c26d.tar.gz troggle-5be508620ef4cb9e106c75548f56c8bbb314c26d.tar.bz2 troggle-5be508620ef4cb9e106c75548f56c8bbb314c26d.zip | |
update localsettings for server and expo machine
Diffstat (limited to 'localsettingsubuntu.py')
| -rw-r--r-- | localsettingsubuntu.py | 39 |
1 files changed, 20 insertions, 19 deletions
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 = '' - -SURVEY_SCANS = '/home/goatchurch/tunnel/cucc/surveys/surveyscans' +EXPOWEB = REPOS_ROOT_PATH + 'expoweb/' +SURVEYS = '/home/expo/' +SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/' +FILES = REPOS_ROOT_PATH + 'expoimages' -LOGFILE = '/home/goatchurch/expoweb/parsing_log.txt' -PHOTOS = '/home/goatchurch/expoweb/photos' +PYTHON_PATH = '/home/expo/expofiles/troggle/' -# 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' |