Merge branch 'master' into new-agg-service

kubernetes/ingress/zooniverse.org.yaml

@@ -290,6 +290,16 @@ spec:
             name: zooniverse-org-root-staging
             port:
               number: 80
+  - host: fe-root.zooniverse.org
+    http:
+      paths:
+      - pathType: Prefix
+        path: /
+        backend:
+          service:
+            name: zooniverse-org-root-production
+            port:
+              number: 80
   - host: fe-static.zooniverse.org
     http:
       paths:

nginx-fem-redirects.conf

@@ -1,7 +1,7 @@
 set $fe_project_uri "https://fe-project.zooniverse.org";
-set $fe_content_pages_uri "https://fe-content-pages.zooniverse.org";
+set $fe_root_uri "https://fe-root.zooniverse.org";
 set $fe_project_host "fe-project.zooniverse.org";
-set $fe_content_pages_host "fe-content-pages.zooniverse.org";
+set $fe_root_host "fe-root.zooniverse.org";
 
 # Project app data and static files
 location ~* ^/projects/(?:_next|assets)/.+?$ {
@@ -12,20 +12,20 @@ location ~* ^/projects/(?:_next|assets)/.+?$ {
     include /etc/nginx/proxy-security-headers.conf;
 }
 
-# About pages data and static files
-location ~* ^/about/(?:_next|assets)/.+?$ {
+# Zooniverse About pages, prefix match
+location /about {
     resolver 1.1.1.1;
-    proxy_pass $fe_content_pages_uri;
-    proxy_set_header Host $fe_content_pages_host;
+    proxy_pass $fe_root_uri;
+    proxy_set_header Host $fe_root_host;
 
     include /etc/nginx/proxy-security-headers.conf;
 }
 
-# Zooniverse About pages
-location ~* ^/about/(?:team|publications)/?$ {
+# Zooniverse Get Involved pages, prefix match
+location /get-involved {
     resolver 1.1.1.1;
-    proxy_pass $fe_content_pages_uri;
-    proxy_set_header Host $fe_content_pages_host;
+    proxy_pass $fe_root_uri;
+    proxy_set_header Host $fe_root_host;
 
     include /etc/nginx/proxy-security-headers.conf;
 }
@@ -422,3 +422,35 @@ location ~* ^/projects/(?:[\w-]*?/)?juliehgibb/stereovision/?(?:(classify|about)
 
     include /etc/nginx/proxy-security-headers.conf;
 }
+
+location ~* ^/projects/(?:[\w-]*?/)?alexfitzpatrick/bradfords-industrial-heritage-in-photographs/?(?:(classify|about)(?:/.+?)?)?/?$ {
+    resolver 1.1.1.1;
+    proxy_pass $fe_project_uri;
+    proxy_set_header Host $fe_project_host;
+
+    include /etc/nginx/proxy-security-headers.conf;
+}
+
+location ~* ^/projects/(?:[\w-]*?/)?talkietoaster/void-orchestra/?(?:(classify|about)(?:/.+?)?)?/?$ {
+    resolver 1.1.1.1;
+    proxy_pass $fe_project_uri;
+    proxy_set_header Host $fe_project_host;
+
+    include /etc/nginx/proxy-security-headers.conf;
+}
+
+location ~* ^/projects/(?:[\w-]*?/)?hjsmith/the-material-culture-of-wills-england-1540-1790/?(?:(classify|about)(?:/.+?)?)?/?$ {
+    resolver 1.1.1.1;
+    proxy_pass $fe_project_uri;
+    proxy_set_header Host $fe_project_host;
+
+    include /etc/nginx/proxy-security-headers.conf;
+}
+
+location ~* ^/projects/(?:[\w-]*?/)?effeli/node-code-breakers-looking-for-patterns-in-lymph-nodes/?(?:(classify|about)(?:/.+?)?)?/?$ {
+    resolver 1.1.1.1;
+    proxy_pass $fe_project_uri;
+    proxy_set_header Host $fe_project_host;
+
+    include /etc/nginx/proxy-security-headers.conf;
+}

nginx-fem-staging-redirects.conf

@@ -1,8 +1,6 @@
 set $fe_project_uri "https://fe-project.preview.zooniverse.org";
-set $fe_content_pages_uri "https://fe-content-pages.preview.zooniverse.org";
 set $fe_root_uri "https://fe-root.preview.zooniverse.org";
 set $fe_project_host "fe-project.preview.zooniverse.org";
-set $fe_content_pages_host "fe-content-pages.preview.zooniverse.org";
 set $fe_root_host "fe-root.preview.zooniverse.org";
 
 # Project app data and static files
@@ -14,29 +12,29 @@ location ~* ^/projects/(?:_next|assets)/.+?$ {
     include /etc/nginx/proxy-security-headers.conf;
 }
 
-# About pages data and static files
-location ~* ^/about/(?:_next|assets)/.+?$ {
+# Root app data and static files
+location ~* ^/(?:_next|assets)/.+?$ {
     resolver 1.1.1.1;
-    proxy_pass $fe_content_pages_uri;
-    proxy_set_header Host $fe_content_pages_host;
+    proxy_pass $fe_root_uri;
+    proxy_set_header Host $fe_root_host;
 
     include /etc/nginx/proxy-security-headers.conf;
 }
 
-# Root app data and static files
-location ~* ^/(?:_next|assets)/.+?$ {
+# Zooniverse About pages
+location /about {
     resolver 1.1.1.1;
     proxy_pass $fe_root_uri;
     proxy_set_header Host $fe_root_host;
 
     include /etc/nginx/proxy-security-headers.conf;
 }
 
-# Zooniverse About pages
-location ~* ^/about/(?:team|publications)/?$ {
+# Zooniverse Get Involved pages
+location /get-involved {
     resolver 1.1.1.1;
-    proxy_pass $fe_content_pages_uri;
-    proxy_set_header Host $fe_content_pages_host;
+    proxy_pass $fe_root_uri;
+    proxy_set_header Host $fe_root_host;
 
     include /etc/nginx/proxy-security-headers.conf;
 }

nginx-redirects.conf

@@ -504,7 +504,7 @@ server {
 server {
     include /etc/nginx/ssl.default.conf;
     server_name planetaryresponsenetwork.org planetaryresponsenetwork.net planetaryresponsenetwork.com www.planetaryresponsenetwork.org www.planetaryresponsenetwork.net www.planetaryresponsenetwork.com;
-    return 301 https://www.zooniverse.org/projects/mrniaboc/planetary-response-network-hurricane-dorian;
+    return 301 https://www.zooniverse.org/projects/alicemead/sudan-road-access-logistics-cluster;
 }
 
 server {