From ece29a885cfbe4a999d95510fab2979a12d74f89 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Jan 12 2018 19:38:51 +0000 Subject: remove the mirrorlist2 items from haproxy --- diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index a507f2e..37a4225 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -49,34 +49,6 @@ backend fp-wiki-backend {% endif %} option httpchk GET /wiki/Main_Page -frontend mirror-lists-frontend - bind 0.0.0.0:10002 - default_backend mirror-lists-backend - -backend mirror-lists-backend - balance hdr(appserver) - timeout connect 30s -{% if env == "staging" %} - server mirrorlist-local1 localhost:18081 check inter 1s rise 2 fall 3 weight 100 - server mirrorlist-local2 localhost:18082 check inter 1s rise 2 fall 3 weight 100 - server mirrorlist-phx2 mirrorlist-phx2:80 check inter 5s rise 2 fall 3 backup -{% endif %} -{% if env == "production" %} -{% if 'mirrorlist-proxies' in group_names %} - server mirrorlist-local1 localhost:18081 check inter 1s rise 2 fall 3 weight 100 - server mirrorlist-local2 localhost:18082 check inter 1s rise 2 fall 3 weight 100 - server mirrorlist-phx2 mirrorlist-phx2:80 check inter 5s rise 2 fall 3 backup - server mirrorlist-host1plus mirrorlist-host1plus:80 check inter 5s rise 2 fall 3 backup - server mirrorlist-ibiblio02 mirrorlist-ibiblio02:80 check inter 5s rise 2 fall 3 backup -{% else %} - server mirrorlist-phx2 mirrorlist-phx2:80 check inter 5s rise 2 fall 3 - server mirrorlist-ibiblio02 mirrorlist-ibiblio02:80 check inter 5s rise 2 fall 3 - server mirrorlist-host1plus mirrorlist-host1plus:80 check inter 5s rise 2 fall 3 backup -{% endif %} -{% endif %} - option httpchk GET /mirrorlist - option allbackups - frontend pkgdb-frontend bind 0.0.0.0:10003 default_backend pkgdb-backend