From a4845e2318d6ac5e183ce70ed9cb90c2ffe725ff Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 9 Dec 2016 04:36:05 +0000 Subject: [PATCH] change src to proxy for pkgs --- playbooks/include/proxies-reverseproxy.yml | 10 ++-------- playbooks/include/proxies-websites.yml | 8 -------- roles/haproxy/templates/haproxy.cfg | 8 ++++---- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 29be5f3811..8e86b253e8 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -1,4 +1,4 @@ -- name: Set up those ProxyPassReverse statements. Somebody get me a cup of coffee.. + name: Set up those ProxyPassReverse statements. Somebody get me a cup of coffee.. hosts: proxies-stg:proxies user: root gather_facts: True @@ -507,7 +507,7 @@ - role: httpd/reverseproxy website: src.fedoraproject.org destname: git - proxyurl: http://pkgs01.stg.phx2.fedoraproject.org + proxyurl: http://localhost:10057 when: env == "staging" - role: httpd/reverseproxy @@ -564,9 +564,3 @@ 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 6dc5ffc50a..e24dd71bad 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -483,14 +483,6 @@ 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" - - 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 dcc1e566fb..ae8254cea9 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -355,7 +355,7 @@ listen docker-candidate-registry 0.0.0.0:10054 listen modernpaste 0.0.0.0:10055 balance hdr(appserver) - server modernpaste01 modernpaste01:80 check inter 10s rise 1 fall 2 + server modernpaste01 modernpaste01:80 check inter 10s rise 1 fall 2 option httpchk GET / {% endif %} @@ -363,15 +363,15 @@ listen modernpaste 0.0.0.0:10055 listen koji 0.0.0.0:10056 balance hdr(appserver) - server koji01 koji01:80 check inter 10s rise 1 fall 2 + 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 +listen src 0.0.0.0:10057 balance hdr(appserver) - server pkgs01 pkgs01:80 check inter 10s rise 1 fall 2 + server pkgs01 pkgs01:80 check inter 10s rise 1 fall 2 option httpchk GET / {% endif %}