diff options
| -rw-r--r-- | mediagoblin/config_spec.ini | 1 | ||||
| -rw-r--r-- | mediagoblin/init/__init__.py | 12 |
2 files changed, 9 insertions, 4 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 7fc5fa70..03243e0b 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -62,6 +62,7 @@ geolocation_map_visible = boolean(default=False) # Theming stuff theme_install_dir = string(default="%(here)s/user_dev/themes/") +theme_web_path = string(default="/theme_static/") theme = string() diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index e9708398..f7bef421 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -102,13 +102,17 @@ def get_jinja_loader(user_template_path=None, current_theme=None): def get_staticdirector(app_config): - if not 'direct_remote_path' in app_config: + # At minimum, we need the direct_remote_path + if not 'direct_remote_path' in app_config \ + or not 'theme_web_path' in app_config: raise ImproperlyConfigured( - "One of direct_remote_path or " - "direct_remote_paths must be provided") + "direct_remote_path and theme_web_path must be provided") + + direct_domains = {None: app_config['direct_remote_path'].strip()} + direct_domains['theme'] = app_config['theme_web_path'].strip() return staticdirect.StaticDirect( - {None: app_config['direct_remote_path'].strip()}) + direct_domains) def setup_storage(): |