diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index bb21dd1b37..570b04af83 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -50,15 +50,6 @@ remotepath: / proxyurl: http://noc01.{{ datacenter }}.fedoraproject.org - - role: httpd/reverseproxy - website: zabbix.fedoraproject.org - destname: zabbixprod - remotepath: / - proxyurl: http://localhost:10068 - keephost: true - header_scheme: true - tags: zabbix - - role: httpd/reverseproxy website: zabbix.stg.fedoraproject.org destname: zabbix diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 3db3b3607a..79b294b727 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -921,14 +921,6 @@ tags: zabbix when: env == "staging" - - role: httpd/website - site_name: zabbix.fedoraproject.org - sslonly: true - #server_aliases: [zabbix.fedoraproject.org] - cert_name: "{{wildcard_cert_name}}" - tags: zabbix - when: env == "production" - - role: httpd/website site_name: mbs.fedoraproject.org sslonly: true diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 2452c67b94..f69703ce49 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -493,19 +493,6 @@ frontend zabbix-frontend bind 0.0.0.0:10068 default_backend zabbix-backend -backend zabbix-backend - balance hdr(appserver) - server zabbix01.stg zabbix01.stg:80 check inter 10s rise 1 fall 2 -# option httpchk GET / -# http-check expect status 200,401,302 -{% endif %} - - -{% if env == "production" %} -frontend zabbix-frontend - bind 0.0.0.0:10068 - default_backend zabbix-backend - backend zabbix-backend balance hdr(appserver) server zabbix01 zabbix01:80 check inter 10s rise 1 fall 2