From 6461430ae30bc8779dacbc1afce42a879379444c Mon Sep 17 00:00:00 2001 From: David Kirwan Date: Wed, 15 Nov 2023 08:10:44 +0000 Subject: [PATCH] zabbix: remove conditions on zabbix configration Rename host zabbix/zabbix.stg to zabbix01 Signed-off-by: David Kirwan --- roles/haproxy/templates/haproxy.cfg | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 5836a60aa4..fea62f4ce4 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -488,26 +488,11 @@ backend fedmsg-raw-zmq-inbound-backend timeout connect 86400000 server busgateway01 busgateway01:9941 weight 1 maxconn 16384 -{% if env == "staging" %} frontend zabbix-frontend bind 0.0.0.0:10068 default_backend zabbix-backend backend zabbix-backend balance hdr(appserver) - server zabbix.stg zabbix.stg:80 check inter 10s rise 1 fall 2 -{% endif %} -# option httpchk GET / -# http-check expect status 200,401,302 -{% if env == "production" %} -frontend zabbix-frontend - bind 0.0.0.0:10068 - default_backend zabbix-backend - -backend zabbix-backend - balance hdr(appserver) - server zabbix zabbix:80 check inter 10s rise 1 fall 2 -# option httpchk GET / -# http-check expect status 200,401,302 -{% endif %} + server zabbix01 zabbix01:80 check inter 10s rise 1 fall 2