X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=cb5c67c3858733ae8e4b392a1e976aeda4bdbc6c;hb=c5f60da7828a73e49b98951b7bf1a67d1e17d502;hp=aef9175c2fd696fb9a97235203ae1257c2ed484b;hpb=9ea1140c359d4bf3c513f34f8f311b911649ceef;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 aef9175c2..cb5c67c38 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -21,11 +21,10 @@
 ######
 # options
 
-
 options {
         # disable the chained hostname format in logs
         # (default is enabled)
-        chain_hostnames(0);
+        chain_hostnames(1);
 
         # the time to wait before a died connection is re-established
         # (default is 60)
@@ -83,11 +82,7 @@ options {
 	# is not a real hostname.
 	bad_hostname("^gconfd$");
 
-<%- if (hostname == "heininen") || (hostname == "lotti") -%>
-	# we trust our mutual authenticated syslog clients
-	keep_hostname(yes);
-<%- end -%>
-
+	keep_hostname(no);
 };