From e6c33c2db92b8b469cf4889fc87edd773bdd2594 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 26 Jul 2016 18:09:43 +0200
Subject: [PATCH] Remove legacy variables
---
templates/haproxy_cfg | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/templates/haproxy_cfg b/templates/haproxy_cfg
index ee271ff..c87b983 100644
--- a/templates/haproxy_cfg
+++ b/templates/haproxy_cfg
@@ -172,7 +172,7 @@ backend backend_{{host}}
{% if host == inventory_hostname or host == 'localhost' %}
http-response deny
{% else %}
- server server_{{host}} {{hostvars[host]['static_ipv4']|default(hostvars[host]['ansible_default_ipv4']['address'])}}:80 maxconn 100
+ server server_{{host}} {{hostvars[host]['static_ipv4']}}:80 maxconn 100
{% endif %}
backend backend_{{host}}_bigpipe
@@ -180,7 +180,7 @@ backend backend_{{host}}_bigpipe
http-response deny
{% else %}
no option http-buffer-request
- server server_{{host}} {{hostvars[host]['static_ipv4']|default(hostvars[host]['ansible_default_ipv4']['address'])}}:80 maxconn 100
+ server server_{{host}} {{hostvars[host]['static_ipv4']}}:80 maxconn 100
{% endif %}
backend backend_{{host}}_https
@@ -188,7 +188,7 @@ backend backend_{{host}}_https
http-response deny
{% else %}
http-response set-header Strict-Transport-Security "max-age=16000000; includeSubDomains; preload;"
- server server_{{host}} {{hostvars[host]['static_ipv4']|default(hostvars[host]['ansible_default_ipv4']['address'])}}:80 maxconn 100
+ server server_{{host}} {{hostvars[host]['static_ipv4']}}:80 maxconn 100
{% endif %}
backend backend_{{host}}_https_bigpipe
@@ -197,7 +197,7 @@ backend backend_{{host}}_https_bigpipe
{% else %}
no option http-buffer-request
http-response set-header Strict-Transport-Security "max-age=16000000; includeSubDomains; preload;"
- server server_{{host}} {{hostvars[host]['static_ipv4']|default(hostvars[host]['ansible_default_ipv4']['address'])}}:80 maxconn 100
+ server server_{{host}} {{hostvars[host]['static_ipv4']}}:80 maxconn 100
{% endif %}
{% endfor %}
{% if varnish_host|default(false) %}
--
GitLab