X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=551b7dbc5d6b201729d5366bfbee58e506e507de;hb=be4d8007860aff43c5da575d18a66c1d0abafe6a;hp=546bf1cb5de0a3bcf4daeeb37c0e2461d629f2b7;hpb=d56ca7cb70039b036d91f93cfb33cb1fb7743e82;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 546bf1cb5..551b7dbc5 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -1,9 +1,13 @@
 <%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
 @version: 3.0
-<%- end -%>
-<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.3" -%>
+<%- elsif has_variable?("syslogversion") and syslogversion.to_s == "3.5" -%>
+@version: 3.5
+@include "scl.conf"
+<%- else -%>
 @version: 3.3
+@include "scl.conf"
 <%- end -%>
+
 ##
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
@@ -47,8 +51,7 @@ options {
         # the number of lines fitting in the output queue
 <%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
         log_fifo_size(2048);
-<%- end -%>
-<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.3" -%>
+<%- else -%>
         log_fifo_size(10000);
 <%- end -%>
 
@@ -104,24 +107,20 @@ options {
 source s_local {
         # message generated by Syslog-NG
         internal();
-<%- if kernel == 'Linux' -%>
+<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
         # standard Linux log source (this is the default place for the syslog()
         # function to send logs to)
         unix-stream("/dev/log");
         # messages from the kernel
         file("/proc/kmsg" program_override("kernel: "));
 <%- else -%>
-        # standard Linux log source (this is the default place for the syslog()
-        # function to send logs to)
-        unix-dgram("/var/run/log");
-        # messages from the kernel
-        file("/dev/klog" program_override("kernel: ") follow-freq(1));
+	system();
 <%- end -%>
 };
 
-<%- if (hostname == "lotti") || (hostname == "lully") -%>
+<%- if (hostname == "lotti") || (hostname == "lully") || (hostname == "loghost-grnet-01") -%>
 source s_network {
-	tcp6(port(5140) max-connections(200)
+	tcp6(port(5140) max-connections(400)
 		tls( key_file("/etc/exim4/ssl/thishost.key")
 		     cert_file("/etc/exim4/ssl/thishost.crt")
 		     ca_dir("/etc/exim4/ssl/")
@@ -400,7 +399,7 @@ log {
  <%- if hostname != "lotti" -%>
 destination loghost-lotti {
 	tcp("lotti.debian.org" port (5140)
-		tls( key_file("/etc/ssl/debian/keys/thishost.key")
+		tls( key_file("/etc/ssl/private/thishost.key")
 		     cert_file("/etc/ssl/debian/certs/thishost.crt")
 		     ca_dir("/etc/ssl/debian/certs/")
 		)
@@ -410,7 +409,17 @@ destination loghost-lotti {
   <%- if hostname != "lully" -%>
 destination loghost-lully {
 	tcp("lully.debian.org" port (5140)
-		tls( key_file("/etc/ssl/debian/keys/thishost.key")
+		tls( key_file("/etc/ssl/private/thishost.key")
+		     cert_file("/etc/ssl/debian/certs/thishost.crt")
+		     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/private/thishost.key")
 		     cert_file("/etc/ssl/debian/certs/thishost.crt")
 		     ca_dir("/etc/ssl/debian/certs/")
 		)
@@ -426,11 +435,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 ########################################################
 ###############################################################################