X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=7f78680b70b475ed658c091239602b5b876402a1;hb=99de6b696673058e3ca5684690ea305fcca68368;hp=c2278e3e0eba2bb466f2c6e5e7f81d67bc1166f4;hpb=be5c9f27eb1a299edd045e63568dc29039242cb7;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 c2278e3e0..7f78680b7 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -1,5 +1,7 @@
 <%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
 @version: 3.0
+<%- elsif has_variable?("syslogversion") and syslogversion.to_s == "3.5" -%>
+@version: 3.5
 <%- else -%>
 @version: 3.3
 <%- end -%>
@@ -117,7 +119,7 @@ source s_local {
 <%- end -%>
 };
 
-<%- if (hostname == "lotti") || (hostname == "lully") -%>
+<%- if (hostname == "lotti") || (hostname == "lully") || (hostname == "loghost-grnet-01") -%>
 source s_network {
 	tcp6(port(5140) max-connections(200)
 		tls( key_file("/etc/exim4/ssl/thishost.key")
@@ -413,6 +415,16 @@ destination loghost-lully {
 		     ca_dir("/etc/ssl/debian/certs/")
 		)
 	);
+};
+ <%- end -%>
+  <%- if hostname != "loghost-grnet-01" -%>
+destination loghost-loghost-grnet-01 {
+	tcp("loghost-grnet-01.debian.org" port (5140)
+		tls( key_file("/etc/ssl/debian/keys/thishost.key")
+		     cert_file("/etc/ssl/debian/certs/thishost.crt")
+		     ca_dir("/etc/ssl/debian/certs/")
+		)
+	);
 };
  <%- end -%>
 
@@ -424,11 +436,14 @@ log {
  <%- if hostname != "lully" -%>
 	destination(loghost-lully);
  <%- end -%>
+ <%- if hostname != "loghost-grnet-01" -%>
+	destination(loghost-loghost-grnet-01);
+ <%- end -%>
 };
 
 
 
-<%- if (hostname == "lotti") || (hostname == "lully") -%>
+<%- if (hostname == "lotti") || (hostname == "lully") || (hostname == "loghost-grnet-01") -%>
 ###############################################################################
 ########## ON LOG HOST ########################################################
 ###############################################################################