Merge pull request #79 from kjkeane/kjkeane-patch-1

Add log-tag and log-send-hostname

Author: aboe76

haproxy/templates/haproxy.jinja

@@ -30,6 +30,12 @@ global
 {%- else %}
     log /dev/log    local0
     log /dev/log    local1 notice
+{%- endif %}
+{%- if salt['pillar.get']('haproxy:global:log-tag') %}
+    log-tag {{ salt['pillar.get']('haproxy:global:log-tag', 'haproxy') }}
+{%- endif %}
+{%- if salt['pillar.get']('haproxy:global:log-send-hostname') %}
+    log-send-hostname {{ salt['pillar.get']('haproxy:global:log-send-hostname') }}
 {%- endif %}
     user {{ salt['pillar.get']('haproxy:global:user', 'haproxy') }}
     group {{ salt['pillar.get']('haproxy:global:group', 'haproxy') }}

pillar.example

@@ -17,6 +17,10 @@ haproxy:
     log:
       - 127.0.0.1 local2
       - 127.0.0.1 local1 notice
+    # Option log-tag parameter, sets the tag field in the syslog header
+    log-tag: haproxy
+    # Optional log-send-hostname parameter, sets the hostname field in the syslog header
+    log-send-hostname: localhost
     stats:
       enable: True
       socketpath: /var/lib/haproxy/stats