From 8563edd4a7a9961cd66644a04bc598e4bf0a29b1 Mon Sep 17 00:00:00 2001 From: Wookey Date: Thu, 11 Sep 2014 06:33:34 +0100 Subject: Use REPOS_ROOT_PATH so there is just one place to change paths --- localsettingsubuntu.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'localsettingsubuntu.py') diff --git a/localsettingsubuntu.py b/localsettingsubuntu.py index fcc8a73..eac75da 100644 --- a/localsettingsubuntu.py +++ b/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' -- cgit v1.2.3