1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/57217275bebe/ Changeset: 57217275bebe User: jmchilton Date: 2015-01-30 22:40:25+00:00 Summary: Another round of reports config improvements. - Respect GALAXY_CONFIG_* when configuring reports web app. - Leave new_file_path and file_path unset in reports config (all defaults should be unspecified and environment variables are more useful). Affected #: 2 files
diff -r 830b542d8f0a15d8f4130561faecbfe36d014127 -r 57217275bebe445be7bdae43b9072bcca47ff3e7 config/reports_wsgi.ini.sample --- a/config/reports_wsgi.ini.sample +++ b/config/reports_wsgi.ini.sample @@ -22,9 +22,9 @@ # database_connection = postgres:///galaxy_test?user=postgres&password=postgres
# Where dataset files are saved -file_path = database/files +#file_path = database/files # Temporary storage for additional datasets, this should be shared through the cluster -new_file_path = database/tmp +#new_file_path = database/tmp
# Mako templates are compiled as needed and cached for reuse, this directory is # used for the cache
diff -r 830b542d8f0a15d8f4130561faecbfe36d014127 -r 57217275bebe445be7bdae43b9072bcca47ff3e7 lib/galaxy/webapps/reports/buildapp.py --- a/lib/galaxy/webapps/reports/buildapp.py +++ b/lib/galaxy/webapps/reports/buildapp.py @@ -16,6 +16,7 @@ import galaxy.model import galaxy.model.mapping import galaxy.web.framework.webapp +from galaxy.util.properties import load_app_properties
log = logging.getLogger( __name__ )
@@ -46,6 +47,9 @@ def app_factory( global_conf, **kwargs ): """Return a wsgi application serving the root object""" # Create the Galaxy application unless passed in + kwargs = load_app_properties( + kwds=kwargs + ) if 'app' in kwargs: app = kwargs.pop( 'app' ) else:
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.