X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsyslog_ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=031e6068c535f1e95b10fe3c0dad97486bf71c7d;hb=1f3cd8bea3ed396c5e1ab35d369e6b72bb27b3f2;hp=d68fe0cdd4a4fd6f767efc54f7b1925d36f8720c;hpb=249b713a08d35bffb1cd52739be6f5808baa5a5f;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 d68fe0cdd..031e6068c 100644
--- a/modules/syslog_ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog_ng/templates/syslog-ng.conf.erb
@@ -3,6 +3,9 @@
 <%- elsif has_variable?("syslogversion") and @syslogversion.to_s == "3.5" -%>
 @version: 3.5
 @include "scl.conf"
+<%- elsif has_variable?("syslogversion") and @syslogversion.to_s == "3.8" -%>
+@version: 3.8
+@include "scl.conf"
 <%- else -%>
 @version: 3.3
 @include "scl.conf"
@@ -116,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") -%>
@@ -129,6 +135,16 @@ source s_network {
 };
 <%- end -%>
 
+<%- if (@hostname == "lully") -%>
+source s_network_fastly {
+	tcp6(port(5141) max-connections(100)
+		tls( key_file("/etc/exim4/ssl/thishost.key")
+		     cert_file("/etc/exim4/ssl/thishost.crt")
+		     peer-verify(optional-untrusted))
+	);
+};
+<%- end -%>
+
 
 ######
 # destinations
@@ -554,3 +570,11 @@ log { source(s_local);
       source(s_network);
       filter(f_syslog); destination(df_ALL_syslog); };
 <%- end -%>
+
+<%- if (@hostname == "lully") -%>
+destination fastly { file("/var/log/fastly.log"); };
+
+log { source(s_network_fastly);
+      destination(fastly); };
+
+<%- end -%>