Fix two copy-paste errors in the merge

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2016-04-05 16:48:36 +00:00
parent 7c611964d6
commit 4330aa92f3

View file

@ -107,7 +107,7 @@ listen bodhi2 0.0.0.0:10010
server bodhi03 bodhi03:80 check inter 20s rise 2 fall 3
server bodhi04 bodhi04:80 check inter 20s rise 2 fall 3
{% else %}
server bodhi02 bodhi04:80 check inter 20s rise 2 fall 3
server bodhi02 bodhi02:80 check inter 20s rise 2 fall 3
{% endif %}
option httpchk GET /
@ -198,7 +198,9 @@ listen datagrepper 0.0.0.0:10028
listen geoip-city 0.0.0.0:10029
balance hdr(appserver)
server sundries01 sundries01:80 check inter 30s rise 2 fall 3
{% if env == "production" %}
server sundries02 sundries02:80 check inter 30s rise 2 fall 3
{% endif %}
option httpchk GET /city?ip=18.0.0.1
# IMPORTANT: 10031 will NOT work because of selinux policies