From 9fd0774dbc97c24872b4d777cb54594cf0e0ba75 Mon Sep 17 00:00:00 2001 From: William Moore Date: Fri, 15 Nov 2024 15:28:48 +0000 Subject: [PATCH 01/12] Move mapr AFTER idr-gallery in web apps list --- ansible/group_vars/omero-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index 28106cf3..4bf3343b 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/ansible/group_vars/omero-hosts.yml @@ -245,10 +245,10 @@ omero_web_apps_packages: - idr-gallery==3.11.0 - omero-figure==6.2.0 omero_web_apps_names: -- omero_mapr - omero_iviewer - idr_gallery - omero_figure +- omero_mapr omero_web_apps_top_links: - label: Studies From 05fd7dc1c654c9aea30ebd050bd23459aa301402 Mon Sep 17 00:00:00 2001 From: William Moore Date: Fri, 15 Nov 2024 15:29:13 +0000 Subject: [PATCH 02/12] Remove mapr ngninx cache --- ansible/group_vars/proxy-hosts.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ansible/group_vars/proxy-hosts.yml b/ansible/group_vars/proxy-hosts.yml index b2d07e42..98adffc2 100644 --- a/ansible/group_vars/proxy-hosts.yml +++ b/ansible/group_vars/proxy-hosts.yml @@ -145,7 +145,7 @@ nginx_proxy_cache_match_uri: - '"~web(client|gateway)/get_thumbnail*"' - '"~(webclient/)?api/*"' - '"~static/*"' -- '"~mapr/*"' +# - '"~mapr/*"' - '"~gallery-api/*"' - '"~webclient/img_detail/*"' - '"~iviewer/*"' @@ -192,12 +192,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 From 775ff7085bdc56b79665a6598155426b007d5d82 Mon Sep 17 00:00:00 2001 From: William Moore Date: Fri, 15 Nov 2024 15:29:49 +0000 Subject: [PATCH 03/12] mapr/api requests return 410 'Gone' response --- ansible/group_vars/proxy-hosts.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible/group_vars/proxy-hosts.yml b/ansible/group_vars/proxy-hosts.yml index 98adffc2..110dc26f 100644 --- a/ansible/group_vars/proxy-hosts.yml +++ b/ansible/group_vars/proxy-hosts.yml @@ -249,6 +249,9 @@ nginx_proxy_redirect_map_locations: - location: "~ ^/(mito|tara|pgpc|study)($|/)" code: 302 +- location: "~ ^/mapr/api/(antibody|gene|compound|sirna|omap|phenotype|organism|orf|cellline|protein)($|/)" + code: 410 + # "= /" has higher priority than "/" in the proxy config nginx_proxy_direct_locations: # TODO: change to 301 when we're happy From d282d66c3271f1e4d405cd786e9c063a9479f0db Mon Sep 17 00:00:00 2001 From: William Moore Date: Mon, 18 Nov 2024 15:17:33 +0000 Subject: [PATCH 04/12] 410 response regex handles all /mapr/api/ except /mapr/api/config --- ansible/group_vars/proxy-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/proxy-hosts.yml b/ansible/group_vars/proxy-hosts.yml index 110dc26f..d57fa390 100644 --- a/ansible/group_vars/proxy-hosts.yml +++ b/ansible/group_vars/proxy-hosts.yml @@ -249,7 +249,7 @@ nginx_proxy_redirect_map_locations: - location: "~ ^/(mito|tara|pgpc|study)($|/)" code: 302 -- location: "~ ^/mapr/api/(antibody|gene|compound|sirna|omap|phenotype|organism|orf|cellline|protein)($|/)" +- location: "~ ^/mapr/api/(?!config).*($|/)" code: 410 # "= /" has higher priority than "/" in the proxy config From 0aba460825e4b5f9ad44927ae025b005742f9299 Mon Sep 17 00:00:00 2001 From: William Moore Date: Mon, 18 Nov 2024 16:09:59 +0000 Subject: [PATCH 05/12] Redirect /mapr/api/ to /searchengine/apidocs/ --- ansible/group_vars/proxy-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/proxy-hosts.yml b/ansible/group_vars/proxy-hosts.yml index d57fa390..717d40b7 100644 --- a/ansible/group_vars/proxy-hosts.yml +++ b/ansible/group_vars/proxy-hosts.yml @@ -250,7 +250,7 @@ nginx_proxy_redirect_map_locations: code: 302 - location: "~ ^/mapr/api/(?!config).*($|/)" - code: 410 + redirect302: /searchengine/apidocs/ # "= /" has higher priority than "/" in the proxy config nginx_proxy_direct_locations: From 439a9b9dfea29e4083420bbc62ead9dfdaf26e49 Mon Sep 17 00:00:00 2001 From: William Moore Date: Tue, 19 Nov 2024 10:13:32 +0000 Subject: [PATCH 06/12] Bump ome.iptables_raw to 0.4.1 --- ansible/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index bb51bb01..4108f6e4 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -40,7 +40,7 @@ version: 4.4.4 - src: ome.iptables_raw - version: 0.4.0 + version: 0.4.1 - src: ome.java version: 2.2.0 From cba9797f6dc510961573caa82e3fd933a8881c61 Mon Sep 17 00:00:00 2001 From: William Moore Date: Thu, 21 Nov 2024 11:58:16 +0000 Subject: [PATCH 07/12] Move searchengine redirect under nginx_proxy_direct_locations --- ansible/group_vars/proxy-hosts.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ansible/group_vars/proxy-hosts.yml b/ansible/group_vars/proxy-hosts.yml index 717d40b7..8a6cd5dc 100644 --- a/ansible/group_vars/proxy-hosts.yml +++ b/ansible/group_vars/proxy-hosts.yml @@ -249,9 +249,6 @@ nginx_proxy_redirect_map_locations: - location: "~ ^/(mito|tara|pgpc|study)($|/)" code: 302 -- location: "~ ^/mapr/api/(?!config).*($|/)" - redirect302: /searchengine/apidocs/ - # "= /" has higher priority than "/" in the proxy config nginx_proxy_direct_locations: # TODO: change to 301 when we're happy @@ -274,6 +271,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 From ccd0beec27fefa5acd5d15c59b59bd795da43339 Mon Sep 17 00:00:00 2001 From: William Moore Date: Mon, 25 Nov 2024 17:56:24 +0000 Subject: [PATCH 08/12] Bump idr-gallery 3.12.0 --- ansible/group_vars/omero-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index 4bf3343b..5bf97a8b 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/ansible/group_vars/omero-hosts.yml @@ -242,7 +242,7 @@ omero_web_config_set: omero_web_apps_packages: - omero-mapr==0.5.2 - omero-iviewer==0.14.0 -- idr-gallery==3.11.0 +- idr-gallery==3.12.0 - omero-figure==6.2.0 omero_web_apps_names: - omero_iviewer From bb4a67f070bdd82cf0eb2e6951055716be6a9ab9 Mon Sep 17 00:00:00 2001 From: William Moore Date: Tue, 26 Nov 2024 13:50:39 +0000 Subject: [PATCH 09/12] Bump iviewer 0.15.0 --- ansible/group_vars/omero-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index 5bf97a8b..09e7c603 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/ansible/group_vars/omero-hosts.yml @@ -241,7 +241,7 @@ omero_web_config_set: omero_web_apps_packages: - omero-mapr==0.5.2 -- omero-iviewer==0.14.0 +- omero-iviewer==0.15.0 - idr-gallery==3.12.0 - omero-figure==6.2.0 omero_web_apps_names: From 630ab9b24e4a4106ce14838401ad265e903a712e Mon Sep 17 00:00:00 2001 From: William Moore Date: Tue, 26 Nov 2024 16:20:02 +0000 Subject: [PATCH 10/12] Bump idr-gallery 3.12.1 --- ansible/group_vars/omero-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index 09e7c603..55835c28 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/ansible/group_vars/omero-hosts.yml @@ -242,7 +242,7 @@ omero_web_config_set: omero_web_apps_packages: - omero-mapr==0.5.2 - omero-iviewer==0.15.0 -- idr-gallery==3.12.0 +- idr-gallery==3.12.1 - omero-figure==6.2.0 omero_web_apps_names: - omero_iviewer From cd682d17de2a00b2b6f69ae9239152a8012ce2f7 Mon Sep 17 00:00:00 2001 From: William Moore Date: Wed, 27 Nov 2024 10:16:53 +0000 Subject: [PATCH 11/12] Bump omero-mapr 0.5.3 --- ansible/group_vars/omero-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index 55835c28..c6306a56 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/ansible/group_vars/omero-hosts.yml @@ -240,7 +240,7 @@ omero_web_config_set: # Plugins and additional web configuration omero_web_apps_packages: -- omero-mapr==0.5.2 +- omero-mapr==0.5.3 - omero-iviewer==0.15.0 - idr-gallery==3.12.1 - omero-figure==6.2.0 From 9fcdb024276cc294e79da31aeb12c1140df45e9b Mon Sep 17 00:00:00 2001 From: William Moore Date: Wed, 4 Dec 2024 10:12:32 +0000 Subject: [PATCH 12/12] Remove omeromapr from _nginx_proxy_backends_omero in proxy-hosts.yml --- ansible/group_vars/proxy-hosts.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ansible/group_vars/proxy-hosts.yml b/ansible/group_vars/proxy-hosts.yml index 8a6cd5dc..d46d9fc4 100644 --- a/ansible/group_vars/proxy-hosts.yml +++ b/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