X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=49de0042079a116fcb97a46a72126e0c0670cc0a;hb=d66548d20484651943302108162b6647d1122015;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..49de00420 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);
 };