Merge pull request #441 from will-moore/mapr_deprecation

Mapr deprecation

ansible/group_vars/omero-hosts.yml

@@ -240,15 +240,15 @@ omero_web_config_set:
 # Plugins and additional web configuration
 
 omero_web_apps_packages:
-- omero-mapr==0.5.2
-- omero-iviewer==0.14.0
-- idr-gallery==3.11.0
-- omero-figure==6.2.0
+- omero-mapr==0.5.3
+- omero-iviewer==0.15.0
+- idr-gallery==3.12.1
+- omero-figure==7.1.0
 omero_web_apps_names:
-- omero_mapr
 - omero_iviewer
 - idr_gallery
 - omero_figure
+- omero_mapr
 
 omero_web_apps_top_links:
 - label: Studies

ansible/group_vars/proxy-hosts.yml

@@ -64,12 +64,6 @@ _nginx_proxy_backends_omero:
   cache_validity: 1d
   maintenance_flag: "{{ omero_maintenance_flag }}"
   maintenance_uri: "{{ omero_maintenance_uri }}"
-- name: omeromapr
-  location: ~ /mapr/*
-  server: http://omeroreadonly
-  cache_validity: 180d
-  maintenance_flag: "{{ omero_maintenance_flag }}"
-  maintenance_uri: "{{ omero_maintenance_uri }}"
 - name: omerostatic
   location: ~ /static/*
   server: http://omeroreadonly
@@ -145,7 +139,7 @@ nginx_proxy_cache_match_uri:
 - '"~web(client|gateway)/get_thumbnail*"'
 - '"~(webclient/)?api/*"'
 - '"~static/*"'
-- '"~mapr/*"'
+# - '"~mapr/*"'
 - '"~gallery-api/*"'
 - '"~webclient/img_detail/*"'
 - '"~iviewer/*"'
@@ -192,12 +186,6 @@ nginx_proxy_caches:
   inactive: 180d
   match:
   - '"~(webclient/)?api/*"'
-- name: omeromapr
-  maxsize: 5g
-  keysize: 100m
-  inactive: 180d
-  match:
-  - '"~mapr/*"'
 - name: omeroviewers  # Metadata for viewers and related UI
   maxsize: 1g
   keysize: 1m
@@ -277,6 +265,8 @@ nginx_proxy_direct_locations:
   alias: /srv/www/letsencrypt/challenge
 - location: "= /submitter-survey"
   redirect302: https://forms.gle/beR4vqLrgLgRzgSX9
+- location: "~ ^/mapr/api/(?!config).*($|/)"
+  redirect302: /searchengine/apidocs/
 
 
 # CORS: basically allow any cross-site since this is public read-only