diff --git a/config/galaxy.yml.interactivetools b/config/galaxy.yml.interactivetools index 6b196a42dbe..35baae11306 100644 --- a/config/galaxy.yml.interactivetools +++ b/config/galaxy.yml.interactivetools @@ -14,10 +14,10 @@ uwsgi: interactivetools_map: database/interactivetools_map.sqlite python-raw: scripts/interactivetools/key_type_token_mapping.py - route-host: ^([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.(realtime\.localhost:8080)$ goto:realtime + route-host: ^([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.(interactivetool\.localhost:8080)$ goto:interactivetool route-run: goto:endendend - route-label: realtime - route-host: ^([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.(realtime\.localhost:8080)$ rpcvar:TARGET_HOST rtt_key_type_token_mapper_cached $2 $1 $3 $4 $0 5 + route-label: interactivetool + route-host: ^([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.(interactivetool\.localhost:8080)$ rpcvar:TARGET_HOST rtt_key_type_token_mapper_cached $2 $1 $3 $4 $0 5 route-if-not: empty:${TARGET_HOST} httpdumb:${TARGET_HOST} route: .* break:404 Not Found route-label: endendend @@ -28,7 +28,7 @@ galaxy: # outputs_to_working_directory will provide you with a better level of isolation. It is highly recommended to set # this parameter with InteractiveTools. outputs_to_working_directory: true - interactivetools_prefix: realtime + interactivetools_prefix: interactivetool interactivetools_map: database/interactivetools_map.sqlite # If you develop InteractiveTools locally and do not have a full FQDN you can # use an arbritrary one, e.g. 'my-hostname' here, if you set this hostname in your diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py index e534d592f2a..14546d08f75 100644 --- a/lib/galaxy/config/__init__.py +++ b/lib/galaxy/config/__init__.py @@ -737,7 +737,7 @@ class GalaxyAppConfiguration(BaseAppConfiguration): # InteractiveTools propagator mapping file self.realtime_map = self.resolve_path(kwargs.get("interactivetools_map", "database/interactivetools_map.sqlite")) - self.realtime_prefix = kwargs.get("interactivetools_prefix", "realtime") + self.realtime_prefix = kwargs.get("interactivetools_prefix", "interactivetool") self.interactivetools_enable = string_as_bool(kwargs.get('interactivetools_enable', False)) # Default chunk size for chunkable datatypes -- 64k