Removed "interactivetools_shorten_url"

doc/source/admin/galaxy_options.rst

@@ -2023,18 +2023,6 @@
 :Type: str
 
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-``interactivetools_shorten_url``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-:Description:
-    Shorten the uuid portion of the subdomain or path for interactive
-    tools. Especially useful for avoiding the need for wildcard
-    certificates by keeping subdomain under 63 chars
-:Default: ``false``
-:Type: bool
-
-
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ``retry_interactivetool_metadata_internally``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

doc/source/admin/special_topics/interactivetools.rst

@@ -117,7 +117,7 @@ section (serving port 443):
 .. code-block:: nginx
 
         # Route all path-based interactive tool requests to the InteractiveTool proxy application
-        location ~* ^/(interactivetool/access/.+)$ {
+        location ~* ^/(interactivetool/.+)$ {
             proxy_redirect off;
             proxy_http_version 1.1;
             proxy_set_header X-Real-IP $remote_addr;
@@ -127,8 +127,7 @@ section (serving port 443):
         }
 
 This example config works for default values of ``interactivetools_base_path`` and ``interactivetools_prefix`` as defined in
-``galaxy.yml``. For other values, you will need to adjust the location patterns accordingly. This solution also
-requires ``interactivetools_shorten_url`` to be set to ``false`` (default).
+``galaxy.yml``. For other values, you will need to adjust the location patterns accordingly.
 
 In both nginx config examples, you might want to replace localhost with your server domain (or possibly
 ``127.0.0.1``), depending on your server setup.

lib/galaxy/config/sample/galaxy.yml.sample

@@ -1293,11 +1293,6 @@ galaxy:
   # interactive tools
   #interactivetools_prefix: interactivetool
 
-  # Shorten the uuid portion of the subdomain or path for interactive
-  # tools. Especially useful for avoiding the need for wildcard
-  # certificates by keeping subdomain under 63 chars
-  #interactivetools_shorten_url: false
-
   # Galaxy Interactive Tools (GxITs) can be stopped from within the
   # Galaxy interface, killing the GxIT job without completing its
   # metadata setting post-job steps. In such a case it may be desirable

lib/galaxy/config/schemas/config_schema.yml

@@ -1450,15 +1450,6 @@ mapping:
         desc: |
           Prefix to use in the formation of the subdomain or path for interactive tools
 
-      interactivetools_shorten_url:
-        type: bool
-        default: false
-        required: false
-        desc: |
-          Shorten the uuid portion of the subdomain or path for interactive tools.
-          Especially useful for avoiding the need for wildcard certificates by keeping
-          subdomain under 63 chars
-
       retry_interactivetool_metadata_internally:
         type: bool
         default: true

test/integration/test_interactivetools_api.py

@@ -156,7 +156,6 @@ class TestInteractiveToolsShortURLIntegration(AbstractTestCases.BaseInteractiveT
     @classmethod
     def handle_galaxy_config_kwds(cls, config):
         super().handle_galaxy_config_kwds(config)
-        config["interactivetools_shorten_url"] = True
         config["job_config_file"] = DOCKERIZED_JOB_CONFIG_FILE