X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=546bf1cb5de0a3bcf4daeeb37c0e2461d629f2b7;hb=d28b594a6b6792f6e54e3ed3aa1ee8c0091ea387;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..546bf1cb5 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -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,12 +115,7 @@ 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 -%>
 };