diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2019-07-29 11:36:24 +0100 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2019-07-29 11:36:24 +0100 |
| commit | c74852b60ba954661b92aae98b79f62d6cb9a4d7 (patch) | |
| tree | fbc02a56f24a8f75aaeed2dce90029b2e0e61123 /localsettingsdocker.py | |
| parent | 2d7892e3b16841e494d43c5e0b25fbe599af777d (diff) | |
| parent | a26109cb3006dd64e1bec38100397ad636813e98 (diff) | |
| download | troggle-c74852b60ba954661b92aae98b79f62d6cb9a4d7.tar.gz troggle-c74852b60ba954661b92aae98b79f62d6cb9a4d7.tar.bz2 troggle-c74852b60ba954661b92aae98b79f62d6cb9a4d7.zip | |
Merge branch 'master' of ssh://expo.survex.com/~/troggle
# Conflicts:
# README.txt
Diffstat (limited to 'localsettingsdocker.py')
| -rw-r--r-- | localsettingsdocker.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/localsettingsdocker.py b/localsettingsdocker.py index aa7e7a9..bc7d8cb 100644 --- a/localsettingsdocker.py +++ b/localsettingsdocker.py @@ -47,13 +47,13 @@ MEDIA_URL = URL_ROOT + DIR_ROOT + 'site_media/' MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/' MEDIA_ADMIN_DIR = '/usr/lib/python2.7/site-packages/django/contrib/admin/media/' -STATIC_URL = URL_ROOT -STATIC_ROOT = DIR_ROOT +STATIC_URL = "/static/" +STATIC_ROOT = "/expo/static" JSLIB_URL = URL_ROOT + 'javascript/' -TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' -TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + '/tinymce_media/' +TINY_MCE_MEDIA_ROOT = STATIC_ROOT + '/tiny_mce/' +TINY_MCE_MEDIA_URL = STATIC_ROOT + '/tiny_mce/' TEMPLATE_DIRS = ( PYTHON_PATH + "templates", |