Merge remote-tracking branch 'origin/master' into staging

[mirror/dsa-puppet.git] / modules / syslog_ng / templates / syslog-ng.conf.erb

diff --git a/modules/syslog_ng/templates/syslog-ng.conf.erb b/modules/syslog_ng/templates/syslog-ng.conf.erb
index bb35177..031e606 100644 (file)
--- a/modules/syslog_ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog_ng/templates/syslog-ng.conf.erb
@@ -119,6 +119,9 @@ source s_local {
 <%- else -%>
        system();
 <%- end -%>
+<%- if has_variable?("haproxy") && @haproxy -%>
+       unix-stream("/var/lib/haproxy/dev/log");
+<%- end -%>
 };
 
 <%- if (@hostname == "lotti") || (@hostname == "lully") || (@hostname == "loghost-grnet-01") -%>