opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-01 15:37:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update static-safe mappings to match new layout, rebuild client.

Browse Source
This commit is contained in:
Dannon Baker
2020-08-10 22:21:02 -04:00
parent 15e3cffbce
commit 0538f3bcf1
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/source/admin/galaxy_options.rst
+4 -4
View File
@@ -1563,10 +1563,10 @@
:Description:
Default localization for Galaxy UI. Allowed values are listed at
the end of client/src/nls/locale.js. With the default
value (auto), the locale will be automatically adjusted to the
user's navigator language. Users can override this settings in
their user preferences if the localization settings are enabled in
the end of client/src/nls/locale.js. With the default value
(auto), the locale will be automatically adjusted to the user's
navigator language. Users can override this settings in their user
preferences if the localization settings are enabled in
user_preferences_extra_conf.yml
:Default: ``auto``
:Type: str
lib/galaxy/config/config_manage.py
+2 -2
View File
@@ -97,8 +97,8 @@ UWSGI_OPTIONS = OrderedDict([
}),
('static-safe', {
'key': 'static-safe',
'desc': """Allow serving images out of `client`. Most modern Galaxy interfaces bundle all of this, but some older pages still serve these via symlink, requiring this rule.""",
'default': 'client/galaxy/images',
'desc': """Allow serving certain assets out of `client`. Most modern Galaxy interfaces bundle all of this, but some older pages still serve these via symlink, requiring this rule.""",
'default': 'client/src/assets',
'type': 'str',
}),
('master', {
lib/galaxy/config/sample/galaxy.yml.sample
+8 -8
View File
@@ -47,10 +47,10 @@ uwsgi:
# Mapping to serve the favicon.
static-map: /favicon.ico=static/favicon.ico
# Allow serving images out of `client`. Most modern Galaxy interfaces
# bundle all of this, but some older pages still serve these via
# symlink, requiring this rule.
static-safe: client/galaxy/images
# Allow serving certain assets out of `client`. Most modern Galaxy
# interfaces bundle all of this, but some older pages still serve
# these via symlink, requiring this rule.
static-safe: client/src/assets
# Enable the master process manager. Disabled by default for maximum
# compatibility with CTRL+C, but should be enabled for use with
@@ -836,10 +836,10 @@ galaxy:
#user_preferences_extra_conf_path: user_preferences_extra_conf.yml
# Default localization for Galaxy UI. Allowed values are listed at the
# end of client/src.js. With the default value
# (auto), the locale will be automatically adjusted to the user's
# navigator language. Users can override this settings in their user
# preferences if the localization settings are enabled in
# end of client/src/nls/locale.js. With the default value (auto), the
# locale will be automatically adjusted to the user's navigator
# language. Users can override this settings in their user preferences
# if the localization settings are enabled in
# user_preferences_extra_conf.yml
#default_locale: auto
lib/galaxy/config/sample/reports.yml.sample
+4 -4
View File
@@ -29,10 +29,10 @@ uwsgi:
# Mapping to serve the favicon.
static-map: /favicon.ico=static/favicon.ico
# Allow serving images out of `client`. Most modern Galaxy interfaces
# bundle all of this, but some older pages still serve these via
# symlink, requiring this rule.
static-safe: client/galaxy/images
# Allow serving certain assets out of `client`. Most modern Galaxy
# interfaces bundle all of this, but some older pages still serve
# these via symlink, requiring this rule.
static-safe: client/src/assets
# Enable the master process manager. Disabled by default for maximum
# compatibility with CTRL+C, but should be enabled for use with
lib/galaxy/config/sample/tool_shed.yml.sample
+4 -4
View File
@@ -29,10 +29,10 @@ uwsgi:
# Mapping to serve the favicon.
static-map: /favicon.ico=static/favicon.ico
# Allow serving images out of `client`. Most modern Galaxy interfaces
# bundle all of this, but some older pages still serve these via
# symlink, requiring this rule.
static-safe: client/galaxy/images
# Allow serving certain assets out of `client`. Most modern Galaxy
# interfaces bundle all of this, but some older pages still serve
# these via symlink, requiring this rule.
static-safe: client/src/assets
# Enable the master process manager. Disabled by default for maximum
# compatibility with CTRL+C, but should be enabled for use with
lib/galaxy/config/script.py
+1 -1
View File
@@ -54,7 +54,7 @@ GALAXY_CONFIG_SUBSTITUTIONS = {
' http: 127.0.0.1:8080': ' ${uwsgi_transport}: ${host}:${port}',
' static-map: /static=static': ' static-map: /static=${static_path}',
' static-map: /favicon.ico=static/favicon.ico': ' static-map: /static=${static_path}/favicon.ico',
' static-safe: client/galaxy/images': ' ${client_path}/galaxy/images',
' static-safe: client/src/assets': ' ${client_path}/src/assets',
' virtualenv: .venv': ' #venv: .venv # not used when running installed',
' pythonpath: lib': ' #pythonpath: lib # not used when running installed',
' #config_dir: false': ' config_dir: ${config_dir}',
lib/galaxy/webapps/galaxy/config_schema.yml
+1 -1
View File
@@ -1170,7 +1170,7 @@ mapping:
required: false
desc: |
Default localization for Galaxy UI.
Allowed values are listed at the end of client/src.js.
Allowed values are listed at the end of client/src/nls/locale.js.
With the default value (auto), the locale will be automatically adjusted to
the user's navigator language.
Users can override this settings in their user preferences if the localization
scripts/get_uwsgi_args.py
+2 -2
View File
@@ -119,8 +119,8 @@ def _get_uwsgi_args(cliargs, kwargs):
if hmr_server.lower() in ['1', 'true', 'default']:
hmr_server = "http:127.0.0.1:8081"
__add_arg(args, 'route', '^/static/dist/ {hmr_server}'.format(hmr_server=hmr_server))
# We always want to append client/galaxy/images as static-safe.
__add_arg(args, 'static-safe', '{here}/client/galaxy/images'.format(here=os.getcwd()))
# We always want to append client/src/assets as static-safe.
__add_arg(args, 'static-safe', '{here}/client/src/assets'.format(here=os.getcwd()))
for arg in DEFAULT_ARGS['_all_'] + DEFAULT_ARGS[cliargs.app]:
if not __arg_set(arg, uwsgi_kwargs):