diff options
author | Sam Wenham <sam@wenhams.co.uk> | 2016-05-20 21:35:58 +0100 |
---|---|---|
committer | Sam Wenham <sam@wenhams.co.uk> | 2016-05-20 21:35:58 +0100 |
commit | 0dd0951b283f6ac2196797cb5e00a67bbe883d55 (patch) | |
tree | 02d97af28186675bbadd29bf52fa83a6ddafb911 | |
parent | b9597fbb5720cce1616c3eba94886ee2fc3296f4 (diff) | |
parent | 6b16724c2a7023f5aa4a07cb147b7e8bb1dc1b57 (diff) | |
download | troggle-0dd0951b283f6ac2196797cb5e00a67bbe883d55.tar.gz troggle-0dd0951b283f6ac2196797cb5e00a67bbe883d55.tar.bz2 troggle-0dd0951b283f6ac2196797cb5e00a67bbe883d55.zip |
Merge
-rw-r--r-- | localsettingspotatohut.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py index 54318f8..f1b6a3b 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. } @@ -48,6 +48,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_URL = URL_ROOT + 'javascript/' TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' |