From be699ca7d0f30b24833ec329ebdb14c6f52cd8fc Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 1 Feb 2017 12:36:19 +0000 Subject: [PATCH] stg proxy configuration for mbs. --- playbooks/include/proxies-reverseproxy.yml | 6 ++++++ playbooks/include/proxies-websites.yml | 7 +++++++ roles/haproxy/templates/haproxy.cfg | 10 ++++++++++ 3 files changed, 23 insertions(+) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 56ea0b0dc0..75e9652838 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -584,6 +584,12 @@ proxyurl: http://localhost:10052 when: env == "staging" + - role: httpd/reverseproxy + website: mbs.fedoraproject.org + destname: mbs + proxyurl: http://localhost:10010 + when: env == "staging" + - role: httpd/reverseproxy website: koji.fedoraproject.org destname: koji diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 58a4feea95..e6036a58bb 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -735,3 +735,10 @@ sslonly: true cert_name: "{{wildcard_cert_name}}" when: env == "staging" + + - role: httpd/website + name: mbs.fedoraproject.org + 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 058147e332..ddc680286a 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -413,6 +413,16 @@ listen kojipkgs 0.0.0.0:10062 option httpchk GET / {% 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 # entries. This proxy also doesn't use the http mode like the others. # stunnel should be sitting on port 9939 (public) and redirecting