From 8fa1f9a2fea0e15213bfc4c666feaff472076225 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Fri, 22 Sep 2017 14:47:15 -0400 Subject: [PATCH] Small tweaks to fixup #2866. --- lib/galaxy/webapps/reports/config.py | 2 +- scripts/common_startup_functions.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/webapps/reports/config.py b/lib/galaxy/webapps/reports/config.py index b69c3f2640f..80b20d3b46e 100644 --- a/lib/galaxy/webapps/reports/config.py +++ b/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) diff --git a/scripts/common_startup_functions.sh b/scripts/common_startup_functions.sh index 8deed854db5..6b2e0cc3d6e 100644 --- a/scripts/common_startup_functions.sh +++ b/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