diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 61060bb286..a6097dcc09 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -176,6 +176,7 @@ keephost: true tags: - id.fedoraproject.org + when: env == "production" - role: httpd/reverseproxy website: "sso{{ env_suffix }}.fedoraproject.org" @@ -185,6 +186,7 @@ keephost: true tags: - sso.fedoraproject.org + when: env == "production" - role: httpd/reverseproxy website: "username.id{{ env_suffix }}.fedoraproject.org" @@ -194,6 +196,33 @@ keephost: true tags: - id.fedoraproject.org + when: env == "production" + + # Ipsilon is moving back to a VM in staging + - role: httpd/reverseproxy + website: "id{{ env_suffix }}.fedoraproject.org" + website: id.stg.fedoraproject.org + destname: id + proxyurl: http://localhost:10020 + tags: + - id.fedoraproject.org + when: env == "staging" + + - role: httpd/reverseproxy + website: "sso{{ env_suffix }}.fedoraproject.org" + destname: id + proxyurl: http://localhost:10020 + tags: + - id.fedoraproject.org + when: env == "staging" + + - role: httpd/reverseproxy + website: "username.id{{ env_suffix }}.fedoraproject.org" + destname: usernameid + proxyurl: http://localhost:10020 + tags: + - id.fedoraproject.org + when: env == "staging" - role: httpd/reverseproxy website: "id{{ env_suffix }}.fedoraproject.org" diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index cac99c00f9..50b2e0144c 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -267,6 +267,20 @@ backend pps-backend {% endif %} +{% if env == "staging" %} +frontend ipsilon-frontend + bind 0.0.0.0:10020 + default_backend ipsilon-backend + +backend ipsilon-backend + balance hdr(appserver) + server ipsilon01 ipsilon01:80 check inter 10s rise 1 fall 2 +{% if env == "production" %} + server ipsilon02 ipsilon02:80 check inter 10s rise 1 fall 2 +{% endif %} + option httpchk GET / +{% endif %} + frontend ipa-frontend bind 0.0.0.0:10053 default_backend ipa-backend