From 58831117e903c362447d23bba06e51265787d015 Mon Sep 17 00:00:00 2001 From: expo Date: Sun, 26 Jul 2015 00:38:10 +0100 Subject: [PATCH 1/2] properly quote JSLIB_PATH and mke clear that example password is just an example --- localsettingspotatohut.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py index 5773816..a9c39d5 100644 --- a/localsettingspotatohut.py +++ b/localsettingspotatohut.py @@ -9,7 +9,7 @@ DATABASES = { 'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. 'NAME': 'troggle', # Or path to database file if using sqlite3. 'USER': 'expo', # Not used with sqlite3. - 'PASSWORD': 'wibble', # Not used with sqlite3. + 'PASSWORD': 'notarealpassword', # 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. } @@ -44,7 +44,7 @@ MEDIA_URL = '/' + DIR_ROOT + 'site_media/' MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/' MEDIA_ADMIN_DIR = '/usr/lib/python2.7/site-packages/django/contrib/admin/media/' -JSLIB_PATH = /usr/share/javascript/ +JSLIB_PATH = '/usr/share/javascript/' TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/' From 7e99c05e87c6f35234b6d4a63e15dc7d13d1f7b0 Mon Sep 17 00:00:00 2001 From: Sam Wenham Date: Sat, 22 Aug 2015 13:28:17 +0100 Subject: [PATCH 2/2] tidy up after merge --- localsettingspotatohut.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py index f60db84..89cd8a0 100644 --- a/localsettingspotatohut.py +++ b/localsettingspotatohut.py @@ -48,11 +48,8 @@ MEDIA_URL = '/' + DIR_ROOT + 'site_media/' MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/' MEDIA_ADMIN_DIR = '/usr/lib/python2.7/site-packages/django/contrib/admin/media/' -<<<<<<< local JSLIB_PATH = '/usr/share/javascript/' -======= JSLIB_URL = URL_ROOT + 'javascript/' ->>>>>>> other TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/'