mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
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).
This commit is contained in:
@@ -22,9 +22,9 @@ log_level = DEBUG
|
||||
# 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
|
||||
|
||||
@@ -16,6 +16,7 @@ from galaxy.util import asbool
|
||||
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 add_ui_controllers( webapp, app ):
|
||||
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:
|
||||
|
||||
Reference in New Issue
Block a user