diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2015-08-22 13:26:38 +0100 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2015-08-22 13:26:38 +0100 |
| commit | f1bb927063a27aa734bc40372bb33864bb82fb13 (patch) | |
| tree | 42344ab8582f2f0bb3f5bc4148fb081404cab1c5 | |
| parent | 751ec9517f56aefb10bbca5039f2d14b808e42b6 (diff) | |
| parent | eeda1bed73917dcf15b82bbd5cd1c252d6d6e8ac (diff) | |
| download | troggle-f1bb927063a27aa734bc40372bb33864bb82fb13.tar.gz troggle-f1bb927063a27aa734bc40372bb33864bb82fb13.tar.bz2 troggle-f1bb927063a27aa734bc40372bb33864bb82fb13.zip | |
Merge settings changes
| -rw-r--r-- | localsettingspotatohut.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py index e5e91d6..f60db84 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,7 +48,11 @@ 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/' |