Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

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

diff --git a/templates/syslog-ng.conf.erb b/templates/syslog-ng.conf.erb
index f39c6b88d8c60ca497d443054a802faae539afaf..f60820d03758666d7e30540b1a8365a592e3eba3 100644 (file)
--- a/templates/syslog-ng.conf.erb
+++ b/templates/syslog-ng.conf.erb
@@ -1,4 +1,4 @@
-<%- if syslogversion == "3" -%>
+<%- if has_variable?("syslogversion") and syslogversion.to_s == "3" -%>
 @version: 3.0
 <%- end -%>
 ##
@@ -102,7 +102,7 @@ source s_local {
         # function to send logs to)
         unix-stream("/dev/log");
         # messages from the kernel
-<%- if syslogversion == "2" -%>
+<%- if has_variable?("syslogversion") and syslogversion.to_s == "2" -%>
         file("/proc/kmsg" log_prefix("kernel: "));
 <%- else -%>
         file("/proc/kmsg" program_override("kernel: "));
@@ -112,7 +112,7 @@ source s_local {
         # function to send logs to)
         unix-dgram("/var/run/log");
         # messages from the kernel
-<%- if syslogversion == "2" -%>
+<%- if has_variable?("syslogversion") and syslogversion.to_s == "2" -%>
         file("/dev/klog" log_prefix("kernel: "));
 <%- else -%>
         file("/dev/klog" program_override("kernel: "));
@@ -191,7 +191,7 @@ destination du_all { usertty("*"); };
 filter f_auth { facility(auth, authpriv); };
 
 # all messages except from the auth and authpriv facilities
-filter f_syslog { not facility(auth, authpriv); };
+filter f_syslog { not facility(auth, authpriv, mail); };
 
 # respectively: messages from the cron, daemon, kern, lpr, mail, news, user,
 # and uucp facilities
@@ -404,7 +404,7 @@ log {
 
 
 <%- if hostname != "heininen" -%>
- <%- if syslogversion == "3" -%>
+ <%- if has_variable?("syslogversion") and syslogversion.to_s == "3" -%>
 destination loghost-heininen {
        tcp("heininen.debian.org" port (5140)
                tls( key_file("/etc/ssl/debian/keys/thishost.key")
@@ -433,50 +433,51 @@ log {
 # The log server, additionally, also logs all local and remote messages to
 # a few special places.
 destination hostdest_auth           { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/auth.log"
-                                      owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                      owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_syslog         { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/syslog"
-                                      owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                      owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_cron           { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/cron.log"
-                                      owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                      owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_daemon         { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/daemon.log"
-                                      owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                      owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_kern           { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/kern.log"
-                                      owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                      owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_lpr            { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/lpr.log"
-                                      owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                      owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_mail           { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/mail.log"
-                                      owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                      owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_news           { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/news.log"
-                                      owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                      owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_user           { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/user.log"
-                                      owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                      owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_uucp           { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/uucp.log"
-                                      owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                      owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_debug          { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/debug"
-                                      owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                      owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_messages       { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/messages"
-                                      owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                      owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 
 
 #----------------------------------------------------------------------
 #  Special catch all destination hostdest_sorting by host
 #----------------------------------------------------------------------
 destination hostdest_facility_dot_info   { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/$FACILITY.info"
-                                           owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                           owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_facility_dot_notice { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/$FACILITY.notice"
-                                           owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                           owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_facility_dot_warn   { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/$FACILITY.warn"
-                                           owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                           owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_facility_dot_err    { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/$FACILITY.err"
-                                           owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                           owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 destination hostdest_facility_dot_crit   { file("/var/log/hosts/$HOST/$YEAR/$MONTH/$DAY/$FACILITY.crit"
-                                           owner(root) group(adm) perm(0640) dir_perm(0750) create_dirs(yes) dir_owner(root) dir_group(adm)); };
+                                           owner(root) group(adm) perm(0640) dir_perm(0755) create_dirs(yes) dir_owner(root) dir_group(adm)); };
 
 
 #----------------------------------------------------------------------
 #  Catch all log files
 #----------------------------------------------------------------------
 destination df_ALL_auth { file("/var/log/auth-all.log"); };
+destination df_ALL_mail { file("/var/log/mail-all.log"); };
 destination df_ALL_syslog { file("/var/log/syslog-all"); };
 
 log { source(s_local);
@@ -528,6 +529,9 @@ log { source(s_local);
 log { source(s_local);
       source(s_network);
       filter(f_auth); destination(df_ALL_auth); };
+log { source(s_local);
+      source(s_network);
+      filter(f_mail); destination(df_ALL_mail); };
 log { source(s_local);
       source(s_network);
       filter(f_syslog); destination(df_ALL_syslog); };