Unverified Commit 7d7a875a authored by Dannon's avatar Dannon Committed by GitHub
Browse files

Merge pull request #5919 from erasche/fix-config-validate

[18.01] Allow schema to validate
parents 6d9df51f 3efda23b
......@@ -45,7 +45,7 @@ mapping:
cookie_path:
type: str
default: null
default: ''
required: false
desc: |
If proxy-prefix is enabled and you're running more than one Galaxy instance
......@@ -109,7 +109,7 @@ mapping:
database_template:
type: str
default: null
default: ''
required: false
desc: |
If auto-creating a postgres database on startup - it can be based on an existing
......@@ -332,7 +332,7 @@ mapping:
watch_tools:
type: str
default: false
default: 'false'
required: false
desc: |
Set to True to enable monitoring of tools and tool directories
......@@ -359,7 +359,7 @@ mapping:
containers_resolvers_config_file:
type: str
default: null
default: ''
required: false
desc: |
Container resolvers configuration (beta). Setup a file describing container
......@@ -455,7 +455,7 @@ mapping:
watch_tool_data_dir:
type: str
default: false
default: 'false'
required: false
desc: |
Set to True to enable monitoring of the tool_data and shed_tool_data_path
......@@ -607,7 +607,7 @@ mapping:
Number of checks to execute if check_job_script_integrity is enabled.
check_job_script_integrity_sleep:
type: str
type: float
default: .25
required: false
desc: |
......@@ -674,7 +674,7 @@ mapping:
smtp_server:
type: str
default: null
default: ''
required: false
desc: |
Galaxy sends mail for various things: subscribing users to the mailing list
......@@ -685,7 +685,7 @@ mapping:
smtp_username:
type: str
default: null
default: ''
required: false
desc: |
If your SMTP server requires a username and password, you can provide them
......@@ -694,7 +694,7 @@ mapping:
smtp_password:
type: str
default: null
default: ''
required: false
desc: |
If your SMTP server requires a username and password, you can provide them
......@@ -719,7 +719,7 @@ mapping:
error_email_to:
type: str
default: null
default: ''
required: false
desc: |
Datasets in an error state include a link to report the error. Those reports
......@@ -729,7 +729,7 @@ mapping:
email_from:
type: str
default: null
default: ''
required: false
desc: |
Email address to use in the 'From' field when sending emails for
......@@ -813,7 +813,7 @@ mapping:
ga_code:
type: str
default: null
default: ''
required: false
desc: |
You can enter tracking code here to track visitor's behavior
......@@ -865,7 +865,7 @@ mapping:
message_box_content:
type: str
default: null
default: ''
required: false
desc: |
Show a message box under the masthead.
......@@ -879,7 +879,7 @@ mapping:
brand:
type: str
default: null
default: ''
required: false
desc: |
Append "/{brand}" to the "Galaxy" text in the masthead.
......@@ -955,21 +955,21 @@ mapping:
biostar_url:
type: str
default: null
default: ''
required: false
desc: |
Enable integration with a custom Biostar instance.
biostar_key_name:
type: str
default: null
default: ''
required: false
desc: |
Enable integration with a custom Biostar instance.
biostar_key:
type: str
default: null
default: ''
required: false
desc: |
Enable integration with a custom Biostar instance.
......@@ -1026,7 +1026,7 @@ mapping:
terms_url:
type: str
default: null
default: ''
required: false
desc: |
The URL linked by the "Terms and Conditions" link in the "Help" menu, as well
......@@ -1140,7 +1140,7 @@ mapping:
nginx_x_accel_redirect_base:
type: str
default: null
default: ''
required: false
desc: |
The same download handling can be done by nginx using X-Accel-Redirect. This
......@@ -1172,7 +1172,7 @@ mapping:
nginx_upload_store:
type: str
default: null
default: ''
required: false
desc: |
nginx can also handle file uploads (user-to-Galaxy) via nginx_upload_module.
......@@ -1182,7 +1182,7 @@ mapping:
nginx_upload_path:
type: str
default: null
default: ''
required: false
desc: |
This value overrides the action set on the file upload form, e.g. the web
......@@ -1191,7 +1191,7 @@ mapping:
nginx_upload_job_files_store:
type: str
default: null
default: ''
required: false
desc: |
Galaxy can also use nginx_upload_module to receive files staged out upon job
......@@ -1201,7 +1201,7 @@ mapping:
nginx_upload_job_files_path:
type: str
default: null
default: ''
required: false
desc: |
Galaxy can also use nginx_upload_module to receive files staged out upon job
......@@ -1307,7 +1307,7 @@ mapping:
dynamic_proxy_golang_api_key:
type: str
default: null
default: ''
required: false
desc: |
The golang proxy uses a RESTful HTTP API for communication with Galaxy
......@@ -1334,7 +1334,7 @@ mapping:
logging:
type: map
default: galaxy.config.LOGGING_CONFIG_DEFAULT
allowempty: True
desc: |
Controls where and how the server logs messages. If unset, the default is to log all messages to standard
output at the level defined by the `log_level` configuration option. Configuration is described in the
......@@ -1427,7 +1427,7 @@ mapping:
allowed_origin_hostnames:
type: str
default: null
default: ''
required: false
desc: |
Return a Access-Control-Allow-Origin response header that matches the Origin
......@@ -1524,7 +1524,7 @@ mapping:
sentry_dsn:
type: str
default: null
default: ''
required: false
desc: |
Log to Sentry
......@@ -1605,7 +1605,7 @@ mapping:
library_import_dir:
type: str
default: null
default: ''
required: false
desc: |
Add an option to the library upload form which allows administrators to
......@@ -1613,7 +1613,7 @@ mapping:
user_library_import_dir:
type: str
default: null
default: ''
required: false
desc: |
Add an option to the library upload form which allows authorized
......@@ -1632,7 +1632,7 @@ mapping:
user_library_import_symlink_whitelist:
type: str
default: null
default: ''
required: false
desc: |
For security reasons, users may not import any files that actually lie
......@@ -1686,7 +1686,7 @@ mapping:
tool_name_boost:
type: float
default: 9
default: 9.0
required: false
desc: |
Boosts are used to customize this instance's toolbox search.
......@@ -1696,7 +1696,7 @@ mapping:
tool_section_boost:
type: float
default: 3
default: 3.0
required: false
desc: |
Boosts are used to customize this instance's toolbox search.
......@@ -1706,7 +1706,7 @@ mapping:
tool_description_boost:
type: float
default: 2
default: 2.0
required: false
desc: |
Boosts are used to customize this instance's toolbox search.
......@@ -1716,7 +1716,7 @@ mapping:
tool_label_boost:
type: float
default: 1
default: 1.0
required: false
desc: |
Boosts are used to customize this instance's toolbox search.
......@@ -1726,7 +1726,7 @@ mapping:
tool_stub_boost:
type: float
default: 5
default: 5.0
required: false
desc: |
Boosts are used to customize this instance's toolbox search.
......@@ -1800,7 +1800,7 @@ mapping:
remote_user_maildomain:
type: str
default: null
default: ''
required: false
desc: |
If use_remote_user is enabled and your external authentication
......@@ -1832,7 +1832,7 @@ mapping:
remote_user_logout_href:
type: str
default: null
default: ''
required: false
desc: |
If use_remote_user is enabled, you can set this to a URL that will log your
......@@ -1859,7 +1859,7 @@ mapping:
admin_users:
type: str
default: null
default: ''
required: false
desc: |
Administrative users - set this to a comma-separated list of valid Galaxy
......@@ -2065,7 +2065,7 @@ mapping:
invocation to schedule indefinitely. The default corresponds to 1 month.
maximum_workflow_jobs_per_scheduling_iteration:
type: str
type: int
default: -1
required: false
desc: |
......@@ -2117,7 +2117,7 @@ mapping:
api_allow_run_as:
type: str
default: null
default: ''
required: false
desc: |
Optional list of email addresses of API users who can make calls on behalf of
......@@ -2163,7 +2163,7 @@ mapping:
ftp_upload_dir:
type: str
default: null
default: ''
required: false
desc: |
Enable Galaxy's "Upload via FTP" interface. You'll need to install and
......@@ -2174,7 +2174,7 @@ mapping:
ftp_upload_site:
type: str
default: null
default: ''
required: false
desc: |
This should be the hostname of your FTP server, which will be provided to
......@@ -2454,7 +2454,7 @@ mapping:
environment_setup_file:
type: str
default: null
default: ''
required: false
desc: |
File to source to set up the environment when running jobs. By default, the
......@@ -2587,3 +2587,11 @@ mapping:
desc: |
persistent_communication_rooms is a comma-separated list of rooms that should be always available.
use_pbkdf2:
type: bool
default: true
required: false
desc: |
Allow disabling pbkdf2 hashing of passwords for legacy situations.
This should normally be left enabled unless there is a specific
reason to disable it.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment