diff --git a/sites/www.zooniverse.org.conf b/sites/www.zooniverse.org.conf index 9e41690..0f821f8 100644 --- a/sites/www.zooniverse.org.conf +++ b/sites/www.zooniverse.org.conf @@ -3,10 +3,8 @@ server { set $fe_project_host "fe-project.zooniverse.org"; include /etc/nginx/ssl.default.conf; - - # DOWNTIME, let the / below catch everything - # include /etc/nginx/project-redirects.conf; - # include /etc/nginx/pfe-redirects.conf; + include /etc/nginx/project-redirects.conf; + include /etc/nginx/pfe-redirects.conf; server_name www.zooniverse.org; @@ -86,27 +84,11 @@ server { } # Default to fe-root app - # SITE DISABLED - # location / { - # resolver 1.1.1.1; - # proxy_pass "https://fe-root.zooniverse.org"; - # proxy_set_header Host fe-root.zooniverse.org; - - # include /etc/nginx/proxy-security-headers.conf; - # } - - # DOWNTIME ENABLED V1 - # set $status_uri "https://zooniverse-359.freshstatus.io"; - # location / { - # # Put the URL in a variable to force re-resolution of the DNS name - # # Otherwise nginx will cache it indefinitely and it'll break if IPs change - # resolver 1.1.1.1; - # proxy_pass $status_uri; - # proxy_set_header Host $host; - # proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; - # } - # DOWNTIME ENABLED V2 location / { - return 301 "https://status.zooniverse.org"; + resolver 1.1.1.1; + proxy_pass "https://fe-root.zooniverse.org"; + proxy_set_header Host fe-root.zooniverse.org; + + include /etc/nginx/proxy-security-headers.conf; } }