X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog_ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=031e6068c535f1e95b10fe3c0dad97486bf71c7d;hb=58e1f2d7822889902465b505fa0698cc3f857a31;hp=89c77ed91ada57c3a38a4fc19d9203847631b88c;hpb=a9bd0396f79339214576a881e6efcf679e53ed5c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/syslog_ng/templates/syslog-ng.conf.erb b/modules/syslog_ng/templates/syslog-ng.conf.erb
index 89c77ed91..031e6068c 100644
--- 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") -%>
@@ -569,7 +572,7 @@ log { source(s_local);
 <%- end -%>
 
 <%- if (@hostname == "lully") -%>
-destination fastly { file("/var/log/fastly.log" };
+destination fastly { file("/var/log/fastly.log"); };
 
 log { source(s_network_fastly);
       destination(fastly); };