From 180bd2ee6ee97a57947fce3764fd0aeeeaaca1d3 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 22 May 2019 08:53:46 +0200 Subject: [PATCH] Move koji to mod_proxy_balancer Signed-off-by: Patrick Uiterwijk --- playbooks/include/proxies-reverseproxy.yml | 6 +++++- .../httpd/reverseproxy/templates/reversepassproxy.koji.conf | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 0493329826..f8e952f52e 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -650,8 +650,12 @@ - role: httpd/reverseproxy website: koji.fedoraproject.org destname: koji - proxyurl: http://localhost:10056 keephost: true + balancer_name: koji + balancer_members: + - "koji01{{ env_prefix }}.phx2.fedoraproject.org" + - "koji02{{ env_prefix }}.phx2.fedoraproject.org" + http_not_https_yes_this_is_insecure_and_i_feel_bad: true - role: httpd/reverseproxy website: kojipkgs.fedoraproject.org diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf index 7b66cabc36..003e5791c4 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf @@ -5,8 +5,7 @@ ProxyTimeout 10800 TimeOut 10800 {% if 'phx2' in inventory_hostname %} -ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}} -ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}} +{% include "reversepassproxy.conf" %} {% else %} Redirect 421 / {% endif %}