From 99576e62300aeece7da0352f97acc02c1d61c3a2 Mon Sep 17 00:00:00 2001 From: yuanzhou Date: Fri, 19 Apr 2024 14:27:24 -0400 Subject: [PATCH 1/2] Add ubkg-download nginx --- nginx/conf.d-prod/ubkg-download.conf | 66 ++++++++++++++++++ .../ubkg-download-maintenance/favicon.ico | Bin 0 -> 1150 bytes .../html/ubkg-download-maintenance/index.html | 39 +++++++++++ nginx/html/ubkg-download-maintenance/logo.png | Bin 0 -> 9739 bytes 4 files changed, 105 insertions(+) create mode 100644 nginx/conf.d-prod/ubkg-download.conf create mode 100644 nginx/html/ubkg-download-maintenance/favicon.ico create mode 100644 nginx/html/ubkg-download-maintenance/index.html create mode 100644 nginx/html/ubkg-download-maintenance/logo.png diff --git a/nginx/conf.d-prod/ubkg-download.conf b/nginx/conf.d-prod/ubkg-download.conf new file mode 100644 index 00000000..22c56849 --- /dev/null +++ b/nginx/conf.d-prod/ubkg-download.conf @@ -0,0 +1,66 @@ +# Port 80 on host maps to 8080 on container +server { + # Only root can listen on ports below 1024, we use higher-numbered ports + # since nginx is running under non-root user hubmap + listen 8080; + server_name ubkg-downloads.xconsortia.org; + + location / { + return 301 https://$host$request_uri; + } +} + +# Port 443 on host maps to 4430 on container +server { + # Only root can listen on ports below 1024, we use higher-numbered ports + # since nginx is running under non-root user hubmap + listen 4430 ssl; # managed by Certbot + server_name ubkg-downloads.xconsortia.org; + root /usr/share/nginx/html; + + ssl_certificate /etc/letsencrypt/live/gateway.api.hubmapconsortium.org/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/gateway.api.hubmapconsortium.org/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot + + # Logging to the mounted volume for outside container access + access_log /usr/src/app/log/nginx_access_ubkg-download.log; + error_log /usr/src/app/log/nginx_error_ubkg-download.log warn; + + # No auth_request for favicon + location = /favicon.ico { + alias /usr/share/nginx/html/favicon.ico; + } + + location / { + # If the file named `maintenance.on` exitis under the target directory + # proxy all the requests to that port of this same container that serves the maintenance page + if (-f /usr/share/nginx/html/ubkg-download-maintenance/maintenance.on) { + # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure + proxy_pass http://127.0.0.1:5035; + } + + proxy_pass http://ubkg-download:3000; + } + +} + +# Port 5035 runs the ubkg-download-maintenance static page index.html +# No need to public this port from the container to host +server { + # Only root can listen on ports below 1024, we use higher-numbered ports + # since nginx is running under non-root user hubmap + listen 5035; + + server_name localhost; + + root /usr/share/nginx/html/ubkg-download-maintenance; + + # Direct all requests to maintenance index.html + # Except the static resources calls from within the maintenance index.html + location / { + # Must use /index.html rather than index.html + try_files $uri /index.html =404; + } +} + diff --git a/nginx/html/ubkg-download-maintenance/favicon.ico b/nginx/html/ubkg-download-maintenance/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..d2a599aed0792fe8bc30351855226c51e41ebb49 GIT binary patch literal 1150 zcmbW%%TE(g6bIljap#7(aP88q3s(LEZdmC;H<$ndiufiHBQY_Ah&+NyPy$Gm5F!M5 z7^3pFvZ8b`tJO>lWC;+$__~sM*Z)B%7L0#wV2HN}tawkpZ{c1u{Se$bi{oMs4FT%4^gZ zSL(nUbkJ$%K?cZxdU_JF5!l*dexDa74ab@t%SJ0+Du(d%{U`>8co>C6Eb7w@sso{5 zkOcx;NEx&jxSS5~f{1&HcH}p7p|jrri%EdMpE73E2#3Qg6bd5E*ltHliC@}Y6G7Y(A(T^0$4acubD^Lk(q^tfAFgrd6J=={|IyC}k9Hl`VR?E+%^ z`z#ubBF*snFgvBf`TqlBQl + + + + + HuBMAP Consortium - UBKG Download Under Maintenance + + + +
+ +

HuBMAP Consortium - UBKG Download Under Maintenance

+
+
+

The site is currently down for maintenance.

+

Sorry for the inconvenience.

+
+ + + diff --git a/nginx/html/ubkg-download-maintenance/logo.png b/nginx/html/ubkg-download-maintenance/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..276903bee37f5828367f9aac2c4aab711e55b08f GIT binary patch literal 9739 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 XnMRK;x9>l87lMj{rhKieMfm>!+3}#0 literal 0 HcmV?d00001 From 730e92b53df087f1f341ee3e17db3af8d92dde73 Mon Sep 17 00:00:00 2001 From: yuanzhou Date: Mon, 22 Apr 2024 17:38:08 -0400 Subject: [PATCH 2/2] Bump version to 2.1.32 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 98dd696e..f00fa322 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.31 +2.1.32