From 4d766c88efc1a46573daf9116b8f0f79cca0884c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 9 Dec 2016 03:33:45 +0000 Subject: [PATCH] move pkgs in stg behind the proxy as well --- playbooks/include/proxies-reverseproxy.yml | 6 ++++++ playbooks/include/proxies-websites.yml | 10 +++++++++- roles/haproxy/templates/haproxy.cfg | 10 +++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 4966eea505..29be5f3811 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -564,3 +564,9 @@ destname: koji proxyurl: http://localhost:10056 when: env == "staging" + + - role: httpd/reverseproxy + website: pkgs.stg.fedoraproject.org + destname: pkgs + proxyurl: http://localhost:10057 + when: env == "staging" diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index dbeb040949..6dc5ffc50a 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -479,7 +479,15 @@ name: koji.stg.fedoraproject.org sslonly: true server_aliases: - - koji.stg.stg.fedoraproject.org + - koji.stg.fedoraproject.org + cert_name: "{{wildcard_cert_name}}" + when: env == "staging" + + - role: httpd/website + name: pkgs.stg.fedoraproject.org + sslonly: true + server_aliases: + - pkgs.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 a96720376a..dcc1e566fb 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -361,11 +361,19 @@ listen modernpaste 0.0.0.0:10055 {% endif %} {% if env == "staging" %} -listen modernpaste 0.0.0.0:10056 +listen koji 0.0.0.0:10056 balance hdr(appserver) server koji01 koji01:80 check inter 10s rise 1 fall 2 option httpchk GET / +{% endif %} +{% if env == "staging" %} + +listen pkgs 0.0.0.0:10057 + balance hdr(appserver) + server pkgs01 pkgs01:80 check inter 10s rise 1 fall 2 + option httpchk GET / + {% endif %} # Apache doesn't handle the initial connection here like the other proxy