Merged pull requests

defaults/main.yml

@@ -44,5 +44,7 @@ haproxy_defaults:
         file: /etc/haproxy/errors/500.http
       - code: 502
         file: /etc/haproxy/errors/502.http
+      - code: 503
+        file: /etc/haproxy/errors/503.http
       - code: 504
         file: /etc/haproxy/errors/504.http

tasks/configure.yml

@@ -67,6 +67,10 @@
   template: src=defaults.cfg dest={{ etc_prefix }}/haproxy/compiled/02-defaults.cfg
   when: haproxy_defaults is defined
 
+- name: 'Build the web stats config'
+  template: src=web_stats.cfg dest={{ etc_prefix }}/haproxy/compiled/07-web_stats.cfg
+  when: haproxy_web_stats is defined
+
 ## ASSEMBLE FINAL CONFIG
 
 - name: 'Assemble the backends configuration file'

tasks/install.yml

@@ -44,12 +44,17 @@
     - socat
   when: ansible_os_family == 'RedHat'
 
-- name: 'Add haproxy apt repo'
+- name: 'Add haproxy apt repo (squeeze)'
   sudo: yes
-  apt_repository: repo="deb http://http.debian.net/debian wheezy-backports main" state=present update_cache=yes
-  when: ansible_distribution_release == "wheezy"
+  apt_repository: repo="deb http://http.debian.net/debian squeeze-backports-sloppy main" state=present update_cache=yes
+  when: ansible_distribution_release == "squeeze"
 
-- name: 'Add haproxy apt repo'
+- name: 'Add haproxy apt repo (wheezy/jessie)'
+  sudo: yes
+  apt_repository: repo="deb http://http.debian.net/debian {{ ansible_distribution_release}}-backports main" state=present update_cache=yes
+  when: ansible_distribution_release == "wheezy" or ansible_distribution_release == "jessie"
+
+- name: 'Add haproxy apt repo (Ubuntu)'
   sudo: yes
   apt_repository: repo="ppa:vbernat/haproxy-1.5" state=present update_cache=yes
   when: ansible_distribution == "Ubuntu"

templates/backend.cfg

@@ -48,3 +48,8 @@ backend {{ item.name }}
     option {{ option }}
 {% endfor %}
 {% endif -%}
+{% if item.timeout is defined -%}
+{% for entry in item.timeout %}
+    timeout {{ entry.param }} {{ entry.value }}
+{% endfor %}
+{% endif -%}

templates/defaults.cfg

@@ -24,26 +24,6 @@ defaults
 {% if haproxy_defaults.maxconn is defined -%}
     maxconn {{ haproxy_defaults.maxconn }}
 {% endif -%}
-{% if haproxy_defaults.stats is defined %}
-{% if haproxy_defaults.stats.enabled is defined and haproxy_defaults.stats.enabled == True %}
-    stats enable
-{% endif -%}
-{% if haproxy_defaults.stats.hide_version is defined and haproxy_defaults.stats.hide_version == true %}
-    stats hide-version
-{% endif -%}
-{% if haproxy_defaults.stats.uri is defined %}
-    stats uri {{ haproxy_defaults.stats.uri }}
-{% endif -%}
-{% if haproxy_defaults.stats.realm is defined %}
-    stats realm {{ haproxy_defaults.stats.realm }}
-{% endif -%}
-{% if haproxy_defaults.stats.auth is defined %}
-    stats auth {{ haproxy_defaults.stats.auth }}
-{% endif -%}
-{% if haproxy_defaults.stats.refresh is defined %}
-    stats refresh {{ haproxy_defaults.stats.refresh }}
-{% endif -%}
-{% endif %}
 {% if haproxy_defaults.options is defined %}
 {% for option in haproxy_defaults.options %}
     option {{ option }}

templates/frontend.cfg

@@ -16,6 +16,12 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if
         maxconn {{ item.maxconn }}
     {% endif -%}
 
+    {% if item.timeout is defined -%}
+    {% for entry in item.timeout %}
+        timeout {{ entry.param }} {{ entry.value }}
+    {% endfor %}
+    {% endif -%}
+
     {%- if item.monitor is defined -%}
        {% if item.monitor.uri is defined -%}
             monitor-uri {{ item.monitor.uri }}
@@ -30,7 +36,7 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if
     {%- if item.acl is defined -%}
     {%- for acl in item.acl -%}
          acl {{ acl.name }} {{ acl.condition }}
-    {% endfor %}
+    {% endfor -%}
     {% endif -%}
 
     {%- if item.reqadd is defined -%}
@@ -83,8 +89,8 @@ frontend {{ item.name }} {%if item.ip is defined %}{{ item.ip }}{% endif %}{%if
     {% endif -%}
 
     {%- if item.use_backend is defined -%}
-        {% for backend in item.use_backend %}
+        {%- for backend in item.use_backend %}
             use_backend {{ backend.name }} {{ backend.condition }}
-        {% endfor %}
+        {% endfor -%}
     {% endif -%}
 

templates/listen.cfg

@@ -44,3 +44,9 @@ listen {{ item.name }}
 {% endfor %}
 {% endif -%}
 
+{% if item.timeout is defined -%}
+{% for entry in item.timeout %}
+    timeout {{ entry.param }} {{ entry.value }}
+{% endfor %}
+{% endif -%}
+

templates/web_stats.cfg

@@ -0,0 +1,23 @@
++{% if haproxy_web_stats is defined %}
++listen stats *:{{ haproxy_web_stats.port | default(1936) }}
++    mode http
++    stats realm Haproxy\ Statistics
++{% if haproxy_web_stats.enabled is defined and haproxy_web_stats.enabled == true %}
++    stats enable
++{% endif -%}
++{% if haproxy_web_stats.hide_version is defined and haproxy_web_stats.hide_version == true %}
++    stats hide-version
++{% endif -%}
++{% if haproxy_web_stats.uri is defined %}
++    stats uri {{ haproxy_web_stats.uri }}
++{% endif -%}
++{% if haproxy_web_stats.realm is defined %}
++    stats realm {{ haproxy_web_stats.realm }}
++{% endif -%}
++{% if haproxy_web_stats.auth is defined %}
++    stats auth {{ haproxy_web_stats.auth }}
++{% endif -%}
++{% if haproxy_web_stats.refresh is defined %}
++    stats refresh {{ haproxy_web_stats.refresh }}
++{% endif -%}
++{% endif %}

vars/main.yml

@@ -77,7 +77,10 @@ empty: true
 #    use_backend:
 #      - name:
 #        condition:
-#
+#    timeout:
+#      - param:
+#        value:
+
 #haproxy_backends:
 #  - name:
 #    disabled:
@@ -86,6 +89,8 @@ empty: true
 #    log:
 #    retries:
 #    contimeout:
+#    NOTE: contimeout is deprecated
+#          http://cbonte.github.io/haproxy-dconv/configuration-1.5.html#4-contimeout
 #    http-send-name-header:
 #    http-check-expect:
 #        - condition
@@ -101,6 +106,9 @@ empty: true
 #              - param1
 #    options:
 #        - forwardfor
+#    timeout:
+#      - param:
+#        value:
 #
 #haproxy_listen:
 #  - name:
@@ -128,3 +136,6 @@ empty: true
 #              - param1
 #    options:
 #        - forwardfor
+#    timeout:
+#      - param:
+#        value: