From 0a0df18b19f09417bdf9061cd930b1df25aadda3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 8 Dec 2016 18:35:27 +0000 Subject: [PATCH] switch koji in stg to use proxy01.stg --- playbooks/include/proxies-reverseproxy.yml | 6 ++++++ playbooks/include/proxies-websites.yml | 7 +++++++ roles/haproxy/templates/haproxy.cfg | 8 ++++++++ 3 files changed, 21 insertions(+) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index a45c74d3c8..4966eea505 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -558,3 +558,9 @@ destname: modernpaste proxyurl: http://localhost:10055 when: env == "staging" + + - role: httpd/reverseproxy + website: koji.stg.fedoraproject.org + destname: koji + proxyurl: http://localhost:10056 + when: env == "staging" diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index aee7bc26a4..cf50bfbf3e 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -475,6 +475,13 @@ cert_name: "{{wildcard_cert_name}}" when: env == "staging" + - role: httpd/website + name: koji.stg..fedoraproject.org + server_aliases: + - koji.stg..stg.fedoraproject.org + cert_name: "{{wildcard_cert_name}}" + when: env == "staging" + - role: httpd/website name: apps.fedoraproject.org server_aliases: [apps.stg.fedoraproject.org] diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 56c88afa1f..a96720376a 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -358,6 +358,14 @@ listen modernpaste 0.0.0.0:10055 server modernpaste01 modernpaste01:80 check inter 10s rise 1 fall 2 option httpchk GET / +{% endif %} +{% if env == "staging" %} + +listen modernpaste 0.0.0.0:10056 + balance hdr(appserver) + server koji01 koji01:80 check inter 10s rise 1 fall 2 + option httpchk GET / + {% endif %} # Apache doesn't handle the initial connection here like the other proxy