opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9909 from gmauro/patch-3

Browse Source
This commit is contained in:
Nicola Soranzo
2020-06-24 10:43:03 +01:00
committed by GitHub
parent 12f1f22e2f c8182b7e21
commit 5d2e5a0ddf
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/source/admin/galaxy_options.rst
+1 -1
View File
@@ -2238,7 +2238,7 @@
Datasets created by tools listed in this file are trusted and will
not have their HTML sanitized on display. This can be manually
edited or manipulated through the Admin control panel -- see
"Manage Display Allowlist"
"Manage Allowlist"
The value of this option will be resolved with respect to
<mutable_config_dir>.
:Default: ``sanitize_allowlist.txt``
lib/galaxy/config/config_manage.py
+1 -1
View File
@@ -167,7 +167,7 @@ UWSGI_OPTIONS = OrderedDict([
'type': 'bool',
}),
('umask', {
'desc': """uWSGI default umask. On some systems uWSGI has a default umask of 000, for Galaxy a somewhat safer default is chosen. If Galaxy submits jobs as real user then all users needs to be able to read the files, i.e. the the umask needs to be '022' or the Galaxy users need to be in the same group as the Galaxy system user""",
'desc': """uWSGI default umask. On some systems uWSGI has a default umask of 000, for Galaxy a somewhat safer default is chosen. If Galaxy submits jobs as real user then all users needs to be able to read the files, i.e. the umask needs to be '022' or the Galaxy users need to be in the same group as the Galaxy system user""",
'default': '027',
'type': 'str',
}),
lib/galaxy/config/sample/galaxy.yml.sample
+3 -3
View File
@@ -101,8 +101,8 @@ uwsgi:
# uWSGI default umask. On some systems uWSGI has a default umask of
# 000, for Galaxy a somewhat safer default is chosen. If Galaxy
# submits jobs as real user then all users needs to be able to read
# the files, i.e. the the umask needs to be '022' or the Galaxy users
# need to be in the same group as the Galaxy system user
# the files, i.e. the umask needs to be '022' or the Galaxy users need
# to be in the same group as the Galaxy system user
umask: 027
galaxy:
@@ -1123,7 +1123,7 @@ galaxy:
# Datasets created by tools listed in this file are trusted and will
# not have their HTML sanitized on display. This can be manually
# edited or manipulated through the Admin control panel -- see "Manage
# Display Allowlist"
# Allowlist"
# The value of this option will be resolved with respect to
# <mutable_config_dir>.
#sanitize_allowlist_file: sanitize_allowlist.txt
lib/galaxy/config/sample/reports.yml.sample
+2 -2
View File
@@ -83,8 +83,8 @@ uwsgi:
# uWSGI default umask. On some systems uWSGI has a default umask of
# 000, for Galaxy a somewhat safer default is chosen. If Galaxy
# submits jobs as real user then all users needs to be able to read
# the files, i.e. the the umask needs to be '022' or the Galaxy users
# need to be in the same group as the Galaxy system user
# the files, i.e. the umask needs to be '022' or the Galaxy users need
# to be in the same group as the Galaxy system user
umask: 027
reports:
lib/galaxy/config/sample/tool_shed.yml.sample
+2 -2
View File
@@ -83,8 +83,8 @@ uwsgi:
# uWSGI default umask. On some systems uWSGI has a default umask of
# 000, for Galaxy a somewhat safer default is chosen. If Galaxy
# submits jobs as real user then all users needs to be able to read
# the files, i.e. the the umask needs to be '022' or the Galaxy users
# need to be in the same group as the Galaxy system user
# the files, i.e. the umask needs to be '022' or the Galaxy users need
# to be in the same group as the Galaxy system user
umask: 027
# Task for rebuilding Toolshed search indexes using the uWSGI