diff --git a/ansible/roles/k8s-lb/templates/haproxy.cfg b/ansible/roles/k8s-lb/templates/haproxy.cfg index 14a6704..4283120 100644 --- a/ansible/roles/k8s-lb/templates/haproxy.cfg +++ b/ansible/roles/k8s-lb/templates/haproxy.cfg @@ -47,10 +47,11 @@ frontend meshdb acl app_letsencrypt path_beg /.well-known/acme-challenge/ use_backend be_letsencrypt if app_letsencrypt - # Stats uses a different backend + # Stats + stats-new uses a different backend acl app_grafana hdr(host) -i stats-new.nycmesh.net - use_backend be_grafana if app_grafana - + acl app_stats hdr(host) -i stats.nycmesh.net + use_backend be_grafana if app_grafana OR app_stats + # Redirect wiki.mesh.nycmesh.net to wiki.nycmesh.net acl is_wiki_mesh hdr(host) -i wiki.mesh.nycmesh.net http-request redirect code 302 location https://wiki.nycmesh.net%[capture.req.uri] if is_wiki_mesh diff --git a/terraform/prod1.tfvars b/terraform/prod1.tfvars index 6d6eb69..7e4a6ba 100644 --- a/terraform/prod1.tfvars +++ b/terraform/prod1.tfvars @@ -46,4 +46,4 @@ mesh_networkrange = "24" mesh_net_block = "10.70.90.0" mesh_external_ip = "199.170.132.45" # Add domains to the end -meshdb_fqdn = "wiki.nycmesh.net,wiki.mesh.nycmesh.net,db.nycmesh.net,map.db.nycmesh.net,adminmap.db.nycmesh.net,los-backend.db.nycmesh.net,los.nycmesh.net,forms.nycmesh.net,stats-new.nycmesh.net,jmstemp.mesh.nycmesh.net,map.nycmesh.net" +meshdb_fqdn = "wiki.nycmesh.net,wiki.mesh.nycmesh.net,db.nycmesh.net,map.db.nycmesh.net,adminmap.db.nycmesh.net,los-backend.db.nycmesh.net,los.nycmesh.net,forms.nycmesh.net,stats-new.nycmesh.net,jmstemp.mesh.nycmesh.net,map.nycmesh.net,stats.nycmesh.net"