diff --git a/maps/backend_hostheader.map b/maps/backend_hostheader.map index 455948fb..728327d0 100644 --- a/maps/backend_hostheader.map +++ b/maps/backend_hostheader.map @@ -21,15 +21,12 @@ checkhostheader hostheader.bu.edu ; # The normal bucket aws_home $backend_hostname ; -# These backends map to specific URLs and need to be hardcoded -aws_home_index buaws-websites-homepage-prod.s3-website-us-east-1.amazonaws.com ; - static-public static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; static-public-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; -static-custom-domain-madlab static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; -static-custom-domain-sitesbuedu-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; -static-custom-domain-framinghamheartstudy-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; +static-domain-madlab static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; +static-domain-sitesbuedu static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; +static-domain-framinghamheartstudy static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; people-public static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; people-public-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; diff --git a/maps/backend_scheme.map b/maps/backend_scheme.map index 9e2aee93..1b5a55e6 100644 --- a/maps/backend_scheme.map +++ b/maps/backend_scheme.map @@ -13,7 +13,6 @@ # Home Page backends aws_home http ; -aws_home_index http ; # This test entry is to a fixed value to simplify the test scripts checkhostheader http ; @@ -21,9 +20,9 @@ checkhostheader http ; static-public http ; static-public-nocache http ; -static-custom-domain-madlab http ; -static-custom-domain-sitesbuedu-nocache http ; -static-custom-domain-framinghamheartstudy-nocache http ; +static-domain-madlab http ; +static-domain-sitesbuedu http ; +static-domain-framinghamheartstudy http ; people-public http ; people-public-nocache http ; diff --git a/maps/cachecontrol.map b/maps/cachecontrol.map index ba0dc36c..36a7f416 100644 --- a/maps/cachecontrol.map +++ b/maps/cachecontrol.map @@ -3,8 +3,8 @@ legacy "no-cache, no-store" ; django "no-cache, no-store" ; static-public-nocache "no-cache, no-store" ; - static-custom-domain-sitesbuedu-nocache "no-cache, no-store" ; - static-custom-domain-framinghamheartstudy-nocache "no-cache, no-store" ; + static-domain-sitesbuedu "no-cache, no-store" ; + static-domain-framinghamheartstudy "no-cache, no-store" ; people-public-nocache "no-cache, no-store" ; apps-rewrite "no-cache, no-store" ; diff --git a/maps/hosts.map.erb b/maps/hosts.map.erb index 745de732..b9c533f5 100644 --- a/maps/hosts.map.erb +++ b/maps/hosts.map.erb @@ -2,83 +2,104 @@ # Legacy Systems # # # # # # # # # # # # # # # # # # # # -legacy <%= ENV['BACKEND_WEB_LEGACY'] || "ist-web-legacy-#{ENV['LANDSCAPE']}.bu.edu" %> ; +legacy ist-web-legacy-prod.bu.edu ; +# # Hosted: ON-PREM (F5 load balancer) -mainframe-java-8082 usl0.bu.edu:8082 ; +mainframe-java-8082 usl0.bu.edu:8082 ; +# # Hosted: ON-PREM (individual app server) # # # # # # # # # # # # # # # # # # # # # Static Sites # # # # # # # # # # # # # # # # # # # # -static-public static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; -static-public-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; +aws_home buaws-websites-homepage-prod.s3-website-us-east-1.amazonaws.com ; +# # Hosted: AWS buaws-websites-prod -static-protected ist-web-static-sites-prod.bu.edu ; +static-public static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; +# # Hosted: AWS ist-cloud-central-app-prd + +static-public-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com ; +# # Hosted: AWS ist-cloud-central-app-prd + +static-protected ist-web-static-sites-prod.bu.edu ; +# # Hosted: ON-PREM (F5 load balancer) # # # # # # # # # # # # # # # # # # # # # Custom Domains # # # # # # # # # # # # # # # # # # # # -static-custom-domain-madlab static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/www.madlab.bu.edu ; +static-domain-madlab static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/www.madlab.bu.edu ; +# # Hosted: AWS ist-cloud-central-app-prd -static-custom-domain-sitesbuedu-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/sites.bu.edu ; +static-domain-sitesbuedu static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/sites.bu.edu ; +# # Hosted: AWS ist-cloud-central-app-prd -static-custom-domain-framinghamheartstudy-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/www.framinghamheartstudy.org ; +static-domain-framinghamheartstudy static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/www.framinghamheartstudy.org ; +# # Hosted: AWS ist-cloud-central-app-prd # # # # # # # # # # # # # # # # # # # # # people.bu.edu # # # # # # # # # # # # # # # # # # # # -people-public static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/people.bu.edu ; -people-public-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/people.bu.edu ; +people-public static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/people.bu.edu ; +# # Hosted: AWS ist-cloud-central-app-prd + +people-public-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/people.bu.edu ; +# # Hosted: AWS ist-cloud-central-app-prd -people-protected ist-web-static-sites-prod.bu.edu/_domains/people.bu.edu ; +people-protected ist-web-static-sites-prod.bu.edu/_domains/people.bu.edu ; +# # Hosted: ON-PREM (F5 load balancer) # # # # # # # # # # # # # # # # # # # # # WordPress # # # # # # # # # # # # # # # # # # # # -wpassets wordpress-prod-alb.webrouter-prd.aws-cloud.bu.edu ; -wordpress wordpress-prod-alb.webrouter-prd.aws-cloud.bu.edu ; +wpassets wordpress-prod-alb.webrouter-prd.aws-cloud.bu.edu ; +# # Hosted: AWS buaws-websites-prod + +wordpress wordpress-prod-alb.webrouter-prd.aws-cloud.bu.edu ; +# # Hosted: AWS buaws-websites-prod + # # # # # # # # # # # # # # # # # # # # # PHP # # # # # # # # # # # # # # # # # # # # -dbin <%= ENV['BACKEND_DBIN'] || "ist-web-dbin-#{ENV['LANDSCAPE']}.bu.edu" %> ; +phpbin-aws ist-web-phpbin-aws-prod.bu.edu ; +# # Hosted: AWS ist-cloud-central-app-prd + +phpbin-nextjs ist-web-phpbin-aws-prod.bu.edu ; +# # Hosted: AWS ist-cloud-central-app-prd -phpbin-aws ist-web-phpbin-aws-prod.bu.edu ; -phpbin-nextjs ist-web-phpbin-aws-prod.bu.edu ; # Custom Domain for wiki.bu.edu: -www-rewrite-wiki ist-web-phpbin-aws-prod.bu.edu/phpbin/wiki ; -www-rewrite-wiki-test ist-web-phpbin-aws-test.bu.edu/phpbin/wiki ; +www-rewrite-wiki ist-web-phpbin-aws-prod.bu.edu/phpbin/wiki ; +# # Hosted: AWS ist-cloud-central-app-prd + +www-rewrite-wiki-test ist-web-phpbin-aws-test.bu.edu/phpbin/wiki ; +# # Hosted: AWS ist-cloud-central-app-prd # # # # # # # # # # # # # # # # # # # # # Other Apps # # # # # # # # # # # # # # # # # # # # -django <%= ENV['BACKEND_DJANGO'] || "ist-web-django-#{ENV['LANDSCAPE']}.bu.edu" %> ; - -uiscgi_app <%= ENV['BACKEND_UISCGI_APP'] || "ist-uiscgi-app-#{ENV['LANDSCAPE']}.bu.edu" %> ; - -uiscgi_content <%= ENV['BACKEND_UISCGI_CONTENT'] || "ist-uiscgi-content-#{ENV['LANDSCAPE']}.bu.edu" %> ; +django <%= ENV['BACKEND_DJANGO'] || "ist-web-django-#{ENV['LANDSCAPE']}.bu.edu" %> ; +# # Hosted: ON-PREM (F5 load balancer) -search ist-web-phpbin-aws-prod.bu.edu/phpbin/search ; +uiscgi_app <%= ENV['BACKEND_UISCGI_APP'] || "ist-uiscgi-app-#{ENV['LANDSCAPE']}.bu.edu" %> ; +# # Hosted: ON-PREM (F5 load balancer) -wp-deploy ist-wp-bld-pr01.bu.edu ; +uiscgi_content <%= ENV['BACKEND_UISCGI_CONTENT'] || "ist-uiscgi-content-#{ENV['LANDSCAPE']}.bu.edu" %> ; +# # Hosted: ON-PREM (F5 load balancer) +search ist-web-phpbin-aws-prod.bu.edu/phpbin/search ; +# # Hosted: AWS ist-cloud-central-app-prd +wp-deploy ist-wp-bld-pr01.bu.edu ; +# # Hosted: ON-PREM (individual app server) -# ### -# The following backend types provide the homepage in S3. -# There are multiple entries because the the homepage needs to map to -# a subdirectory on the S3 bucket. -# -# This aws_homepage bucket is used for everything that maps normally: -aws_home buaws-websites-homepage-prod.s3-website-us-east-1.amazonaws.com ; diff --git a/maps/sites.map b/maps/sites.map index 2dd9bc02..2117f173 100644 --- a/maps/sites.map +++ b/maps/sites.map @@ -1660,7 +1660,7 @@ www.city-convenience.com redirect_asis ; www.computationalimmunology.org redirect ; www.ddensmore.net redirect ; www.indigobirds.com redirect ; -www.madlab.bu.edu static-custom-domain-madlab ; +www.madlab.bu.edu static-domain-madlab ; www.martinlutherkingjrarchive.net redirect_asis ; www.martinlutherkingjrarchive.org redirect_asis ; www.martinlutherkingjrcollection.com redirect_asis ; @@ -1702,7 +1702,7 @@ blogs.bu.edu/vschmidt redirect_asis ; # sites.bu.edu sites.bu.edu/agingny redirect_asis ; sites.bu.edu/akwok redirect ; -sites.bu.edu/autismsa/training static-custom-domain-sitesbuedu-nocache ; +sites.bu.edu/autismsa/training static-domain-sitesbuedu ; sites.bu.edu/collegeharmsfromothersdrinking redirect_asis ; sites.bu.edu/earlcenter redirect_asis ; sites.bu.edu/geddesgrants redirect_asis ; @@ -1724,7 +1724,7 @@ sites.bu.edu/vschmidt redirect_asis ; people.bu.edu people-public ; # www.framinghamheartstudy.org -www.framinghamheartstudy.org/training static-custom-domain-framinghamheartstudy-nocache ; +www.framinghamheartstudy.org/training static-domain-framinghamheartstudy ; # Sites with .shtml files: people.bu.edu/alyasoff people-protected ;