Merge pull request #4679 from jmchilton/yaml_config_fixes

[17.09] Small tweaks to configuration and static assets

lib/galaxy/webapps/reports/config.py

@@ -64,7 +64,7 @@ class Configuration(object):
 
     def check(self):
         # Check that required directories exist
-        for path in self.root, self.file_path, self.template_path:
+        for path in self.root, self.template_path:
             if not os.path.isdir(path):
                 raise ConfigurationError("Directory does not exist: %s" % path)
 

scripts/common_startup_functions.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 
-uwsgi_args="--master --pythonpath=lib"
+: ${GALAXY_STATIC_DIRECTORY:=static}
+: ${GALAXY_STYLE_DIRECTORY:=static/style/blue}
+uwsgi_args="--master --pythonpath=lib --static-map /static=$GALAXY_STATIC_DIRECTORY --static-map /static/style=$GALAXY_STYLE_DIRECTORY"
 
 parse_common_args() {
     INITIALIZE_TOOL_DEPENDENCIES=1