From 4ea6abbc79899ac7fec27388f0a8613efb9e8d88 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Thu, 20 Feb 2014 10:52:19 -0500 Subject: [PATCH] Minor updates to comments/documentation in universe_wsgi.ini.sample --- universe_wsgi.ini.sample | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/universe_wsgi.ini.sample b/universe_wsgi.ini.sample index edd2246344d..7c12ef21877 100644 --- a/universe_wsgi.ini.sample +++ b/universe_wsgi.ini.sample @@ -3,7 +3,7 @@ # environment. To tune the application for a multi-user production # environment, see the documentation at: # -# http://wiki.g2.bx.psu.edu/Admin/Config/Performance/Production%20Server +# http://usegalaxy.org/production # # Throughout this sample configuration file, except where stated otherwise, @@ -11,7 +11,7 @@ # values are set to the default value. # Examples of many of these options are explained in more detail in the wiki: # -# http://wiki.g2.bx.psu.edu/Admin/Config +# https://wiki.galaxyproject.org/Admin/Config # # Config hackers are encouraged to check there before asking for help. @@ -140,9 +140,12 @@ paste.app_factory = galaxy.web.buildapp:app_factory # Other tool config files must include the tool_path as an attribute in the tag. #tool_path = tools -# Path to the directory in which managed tool dependencies are placed. To use -# the dependency system, see the documentation at: -# http://wiki.g2.bx.psu.edu/Admin/Config/Tool%20Dependencies +# Path to the directory in which tool dependencies are placed. This is used by +# the tool shed to install dependencies and can also be used by administrators +# to manually install or link to dependencies. For details, see: +# https://wiki.galaxyproject.org/Admin/Config/ToolDependencies +# If this option is not set to a valid path, installing tools with dependencies +# from the Tool Shed will fail. #tool_dependency_dir = None # Enable automatic polling of relative tool sheds to see if any updates @@ -169,7 +172,7 @@ paste.app_factory = galaxy.web.buildapp:app_factory # Directory where data used by tools is located, see the samples in that # directory and the wiki for help: -# http://wiki.g2.bx.psu.edu/Admin/Data%20Integration +# https://wiki.galaxyproject.org/Admin/DataIntegration #tool_data_path = tool-data # Directory where chrom len files are kept, currently mainly used by trackster @@ -196,6 +199,10 @@ visualization_plugins_directory = config/plugins/visualizations # directory. #cluster_files_directory = database/pbs +# Mako templates are compiled as needed and cached for reuse, this directory is +# used for the cache +#template_cache_path = database/compiled_templates + # External service types config file, defines what types of external_services configurations # are available in Galaxy. #external_service_type_config_file = external_service_types_conf.xml @@ -532,7 +539,7 @@ use_interactive = True # -- Data Libraries # These library upload options are described in much more detail in the wiki: -# http://wiki.g2.bx.psu.edu/Admin/Data%20Libraries/Uploading%20Library%20Files +# https://wiki.galaxyproject.org/Admin/DataLibraries/UploadingLibraryFiles # Add an option to the library upload form which allows administrators to # upload a directory of files. @@ -590,7 +597,7 @@ use_interactive = True # User authentication can be delegated to an upstream proxy server (usually # Apache). The upstream proxy should set a REMOTE_USER header in the request. # Enabling remote user disables regular logins. For more information, see: -# http://wiki.g2.bx.psu.edu/Admin/Config/Apache%20Proxy +# https://wiki.galaxyproject.org/Admin/Config/ApacheProxy #use_remote_user = False # If use_remote_user is enabled and your external authentication @@ -618,7 +625,7 @@ use_interactive = True # users (email addresses). These users will have access to the Admin section # of the server, and will have access to create users, groups, roles, # libraries, and more. For more information, see: -# http://wiki.g2.bx.psu.edu/Admin/Interface +# https://wiki.galaxyproject.org/Admin/Interface #admin_users = None # Force everyone to log in (disable anonymous access). @@ -723,8 +730,8 @@ use_interactive = True # separate Galaxy into multiple processes. There are more than one way to do # this, and they are explained in detail in the documentation: # -# http://wiki.g2.bx.psu.edu/Admin/Config/Performance/Web%20Application%20Scaling -# +# https://wiki.galaxyproject.org/Admin/Config/Performance/Scaling + # By default, Galaxy manages and executes jobs from within a single process and # notifies itself of new jobs via in-memory queues. Jobs are run locally on # the system on which Galaxy is started. Advanced job running capabilities can