Merge pull request #198 from dbmi-bgm/kmp_C4-271_http_cgap_to_https_c…

…gap_wsgi_rewrite Adjust wsgi conf for http to https rewrite of cgap.hms.harvard.edu (C4-271)
dbmi-bgm · Sep 16, 2020 · fed512f · fed512f
2 parents a469d05 + 9564728
commit fed512f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.ebextensions/05_set_wsgi.config b/.ebextensions/05_set_wsgi.config
@@ -84,7 +84,10 @@ files:
       # Redirect http to https from the load balancer
       # https://stackoverflow.com/a/38751749
       <If "-n '%{HTTP:X-Forwarded-Proto}' && %{HTTP:X-Forwarded-Proto} != 'https'">
-         RewriteCond %{HTTP_HOST} ^(data\.4dnucleome\.org|testportal\.4dnucleome\.org)$
+         # Note in 4DN the rewrite condition is:
+         #  RewriteCond %{HTTP_HOST} ^(data\.4dnucleome\.org|testportal\.4dnucleome\.org)$
+         # but if CGAP has the equivalent of a testportal, I don't know about it. -kmp 2-Sep-2020
+         RewriteCond %{HTTP_HOST} ^(cgap\.hms\.harvard\.edu)$
          RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [redirect=permanent,last,qsappend]
       </If>
       ### END originally in encoded-apache.conf

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 # Note: Various modules refer to this system as "encoded", not "cgap-portal".
 name = "encoded"
-version = "2.5.5"
+version = "2.5.6"
 description = "Clinical Genomics Analysis Platform"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"