X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=60ac374efd3b32c8759c4190c2ab638088fd5336;hb=7e9f3801f497c8f0a05094e04656f059fc903e56;hp=23f53934be7b00223cea0dfe7bd1a9f86a54ad3d;hpb=abe4b79131b9e868447dc91b7857c242f356d08c;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 23f53934b..60ac374ef 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -144,7 +144,7 @@ destination df_daemon { file("/var/log/daemon.log"); };
 destination df_kern { file("/var/log/kern.log"); };
 destination df_lpr { file("/var/log/lpr.log"); };
 destination df_mail { file("/var/log/mail.log" group(maillog)); };
-destination df_mail_info { file("/var/log/mail.info" group(maillog)); };
+# destination df_mail_info { file("/var/log/mail.info" group(maillog)); };
 destination df_mail_warn { file("/var/log/mail.warn" group(maillog)); };
 destination df_mail_err { file("/var/log/mail.err" group(maillog)); };
 destination df_user { file("/var/log/user.log" perm(0644)); };
@@ -310,12 +310,12 @@ log {
 };
 
 # mail.info                       -/var/log/mail.info
-log {
-        source(s_local);
-        filter(f_mail);
-        filter(f_at_least_info);
-        destination(df_mail_info);
-};
+#log {
+#        source(s_local);
+#        filter(f_mail);
+#        filter(f_at_least_info);
+#        destination(df_mail_info);
+#};
 
 # mail.warn                       -/var/log/mail.warn
 log {
@@ -399,7 +399,6 @@ log {
 <%- end -%>
 
 
-<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
   <%- if hostname != "heininen" -%>
 destination loghost-heininen {
 	tcp("heininen.debian.org" port (5140)
@@ -430,7 +429,6 @@ log {
 	destination(loghost-lotti);
  <%- end -%>
 };
-<%- end -%>