From 4a38cb21b6edabee286f5b4416a879ce76b76c68 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 1 Mar 2017 18:38:52 +0000 Subject: [PATCH] Wire proxies up to mbs.fp.o. --- playbooks/include/proxies-reverseproxy.yml | 1 - playbooks/include/proxies-websites.yml | 1 - roles/haproxy/templates/haproxy.cfg | 2 -- 3 files changed, 4 deletions(-) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 8778eb67f6..ba08aeb7cb 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -582,7 +582,6 @@ website: mbs.fedoraproject.org destname: mbs proxyurl: http://localhost:10063 - when: env == "staging" - role: httpd/reverseproxy website: koji.fedoraproject.org diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 7b63d1fa0f..d12304641f 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -736,4 +736,3 @@ sslonly: true server_aliases: [mbs.stg.fedoraproject.org] cert_name: "{{wildcard_cert_name}}" - when: env == "staging" diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 64d6b6fb36..d0888a435c 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -421,13 +421,11 @@ listen kojipkgs 0.0.0.0:10062 {% endif %} -{% if env == "staging" %} listen mbs 0.0.0.0:10063 balance hdr(appserver) server mbs-frontend01 mbs-frontend01:80 check inter 20s rise 2 fall 3 server mbs-frontend02 mbs-frontend02:80 check inter 20s rise 2 fall 3 option httpchk GET /module-build-service/1/module-builds/ -{% endif %} # Apache doesn't handle the initial connection here like the other proxy