openstack/horizon
Code Issues Proposed changes

Merge "Allow STATIC_ROOT override"

Browse Source
This commit is contained in:
Jenkins 2015-07-21 10:48:10 +00:00 committed by Gerrit Code Review
commit 03497b4329
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_dashboard/settings.py
View File

@ -46,7 +46,7 @@ WEBROOT = '/'
LOGIN_URL = None LOGIN_URL = None
LOGOUT_URL = None LOGOUT_URL = None
LOGIN_REDIRECT_URL = None LOGIN_REDIRECT_URL = None
STATIC_ROOT = None
ROOT_URLCONF = 'openstack_dashboard.urls' ROOT_URLCONF = 'openstack_dashboard.urls'
@ -278,7 +278,10 @@ if LOGIN_REDIRECT_URL is None:
MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media')) MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
MEDIA_URL = WEBROOT + 'media/' MEDIA_URL = WEBROOT + 'media/'
STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static'))
if STATIC_ROOT is None:
STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static'))
STATIC_URL = WEBROOT + 'static/' STATIC_URL = WEBROOT + 'static/'
STATICFILES_DIRS = get_staticfiles_dirs(WEBROOT) STATICFILES_DIRS = get_staticfiles_dirs(WEBROOT)