expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 07:11:52 +00:00
Code Issues 19 Projects 3 Activity

update localsettings for server and expo machine

Browse Source
This commit is contained in:
ExpoOnServer 2011-07-14 03:50:49 +01:00
parent 82e968d5c7
commit 5be508620e
2 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
localsettingsserver.py
View File

@ -8,31 +8,39 @@ DATABASE_PASSWORD = 'aiGohsh5' # Not used with sqlite3.
DATABASE_HOST = '' # Set to empty string for localhost. 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. 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/' SURVEX_DATA = '/home/expo/loser/'
TUNNEL_DATA = '/home/expo/tunneldata/'
CAVERN = 'cavern' CAVERN = 'cavern'
THREEDTOPOS = '3dtopos' THREEDTOPOS = '3dtopos'
EXPOWEB = '/home/expo/expoweb/' EXPOWEB = '/home/expo/expoweb/'
SURVEYS = '/home/expo/' SURVEYS = '/home/expo/'
SURVEY_SCANS = '/home/expo/expoimages/' SURVEY_SCANS = '/home/expo/expoimages/'
FILES = '/home/expo/expoimages' FILES = '/home/expo/expoimages'
EXPOWEB_URL = 'http://expo.survex.com/' EXPOWEB_URL = 'http://expo.survex.com/'
PUBLIC_SITE = True MMMMC_DIR = "/home/expo/mmmc"
SURVEYS_URL = 'http://troggle.cavingexpedition.com/survey_scans/' SURVEYS_URL = 'http://expo.survex.com/survey_scans/'
SVX_URL = 'http://framos.lawoftheland.co.uk/troggle/survex/'
PYTHON_PATH = '/home/expo/troggle/' 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_ROOT = '/home/expo/troggle/media/'
MEDIA_ADMIN_DIR = '/usr/lib/python2.4/site-packages/django/contrib/admin/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_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/'

39
localsettingsubuntu.py
View File

@ -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_ENGINE = 'mysql' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
DATABASE_NAME = 'troggle' # Or path to database file if using sqlite3. 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_PASSWORD = 'ggg' # Not used with sqlite3.
DATABASE_HOST = '' # Set to empty string for localhost. 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. 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/' REPOS_ROOT_PATH = '/home/expo/expofiles/'
SURVEYS = '/home/goatchurch/tunnel/cucc/surveys'
EXPOWEB_URL = 'http://expo.survex.com/' sys.path.append(REPOS_ROOT_PATH)
sys.path.append(REPOS_ROOT_PATH + 'troggle')
PUBLIC_SITE = False PUBLIC_SITE = False
SURVEX_DATA = REPOS_ROOT_PATH + 'loser/'
TUNNEL_DATA = REPOS_ROOT_PATH + 'tunneldata/'
CAVERN = 'cavern' CAVERN = 'cavern'
THREEDTOPOS = '3dtopos' THREEDTOPOS = '3dtopos'
EXPOWEB = '/home/goatchurch/expoweb/' EXPOWEB = REPOS_ROOT_PATH + 'expoweb/'
SURVEYS_URL = '' 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' #URL_ROOT = 'http://127.0.0.1:8000'
URL_ROOT = "http://expobox/"
# going to survey files (needs better name) DIR_ROOT = ''#this should end in / if a value is given
#FILES = "http://framos.lawoftheland.co.uk/troggle/survey_files/"
FILES = "/home/goatchurch/tunnel/cucc/surveys"
EXPOWEB_URL = 'http://expobox/'
SURVEYS_URL = 'http://expobox/survey_scans/'
MEDIA_URL = URL_ROOT + DIR_ROOT + '/site_media/' MEDIA_URL = URL_ROOT + DIR_ROOT + '/site_media/'
#URL_ROOT = '/troggle/' MEDIA_ROOT = '/home/expo/expofiles/troggle/media/'
MEDIA_ROOT = '/home/goatchurch/expoweb/troggle/media/' MEDIA_ADMIN_DIR = '/usr/lib/python2.4/site-packages/django/contrib/admin/media/'
URL_ROOT = 'http://127.0.0.1:8000'
DIR_ROOT = ''#this should end in / if a value is given
TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' 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/'
@ -48,3 +48,4 @@ TEMPLATE_DIRS = (
# Don't forget to use absolute paths, not relative paths. # Don't forget to use absolute paths, not relative paths.
) )
LOGFILE = '/home/expo/expofiles/expoweb/parsing_log.txt'