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=f2486d7eb69e4abe4ee6b4dfb45abca2613a9521;hpb=1225982b1493713085288aa1a3b87c98f68a1d60;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 f2486d7eb..7f78680b7 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -1,7 +1,8 @@
 <%- 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
+<%- else -%>
 @version: 3.3
 <%- end -%>
 ##
@@ -47,8 +48,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 -%>
 
@@ -91,6 +91,9 @@ options {
 	bad_hostname("^gconfd$");
 
 	keep_hostname(no);
+
+	# We believe our own clock more than we believe the client clock.
+	keep_timestamp(no);
 };
 
 
@@ -112,16 +115,11 @@ source s_local {
         # function to send logs to)
         unix-dgram("/var/run/log");
         # messages from the kernel
-        file("/dev/klog" program_override("kernel: "));
-<%- end -%>
-<%- if hostname == "paganini" -%>
-        # use the following line if you want to receive remote UDP logging messages
-        # (this is equivalent to the "-r" syslogd flag)
-        udp();
+        file("/dev/klog" program_override("kernel: ") follow-freq(1));
 <%- 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")
@@ -417,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 -%>
 
@@ -428,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 ########################################################
 ###############################################################################