give wuiet and quantz access to the main cluster on bmdb1

[mirror/dsa-puppet.git] / modules / syslog-ng / templates / syslog-ng.conf.erb

diff --git a/modules/syslog-ng/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb
index f2486d7..546bf1c 100644 (file)
--- 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 -%>
 };