openstack/horizon
Code Issues Proposed changes

Allow STATIC_ROOT override

Browse Source 
STATIC_ROOT is a file system location. It does not need to be tied
to WEBROOT.

Change-Id: I4935c5d8bd883cb5f091af22582e942f13aa5100
Partial-Bug: #1399585
This commit is contained in:
David Lyle 2015-07-13 11:40:32 -06:00
parent a336dbd707
commit f341decaeb
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
LOGOUT_URL = None
LOGIN_REDIRECT_URL = None
STATIC_ROOT = None
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_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/'
STATICFILES_DIRS = get_staticfiles_dirs(WEBROOT)