projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add gabrielli.debian.org
[mirror/dsa-puppet.git]
/
templates
/
syslog-ng.conf.erb
diff --git
a/templates/syslog-ng.conf.erb
b/templates/syslog-ng.conf.erb
index
637250b
..
3d64384
100644
(file)
--- a/
templates/syslog-ng.conf.erb
+++ b/
templates/syslog-ng.conf.erb
@@
-83,7
+83,7
@@
options {
source s_all {
# message generated by Syslog-NG
internal();
source s_all {
# message generated by Syslog-NG
internal();
-<% if
$
kernel == 'Linux' %>
+<% if kernel == 'Linux' %>
# standard Linux log source (this is the default place for the syslog()
# function to send logs to)
unix-stream("/dev/log");
# standard Linux log source (this is the default place for the syslog()
# function to send logs to)
unix-stream("/dev/log");
@@
-138,10
+138,12
@@
destination df_news_dot_crit { file("/var/log/news/news.crit" owner("news")); };
destination df_debug { file("/var/log/debug"); };
destination df_messages { file("/var/log/messages"); };
destination df_debug { file("/var/log/debug"); };
destination df_messages { file("/var/log/messages"); };
+<% if kernel == 'Linux' %>
# pipes
# a console to view log messages under X
destination dp_xconsole { pipe("/dev/xconsole"); };
# pipes
# a console to view log messages under X
destination dp_xconsole { pipe("/dev/xconsole"); };
+<% end %>
# consoles
# this will send messages to everyone logged in
destination du_all { usertty("*"); };
# consoles
# this will send messages to everyone logged in
destination du_all { usertty("*"); };
@@
-190,6
+192,7
@@
filter f_messages {
# messages with priority emerg
filter f_emerg { level(emerg); };
# messages with priority emerg
filter f_emerg { level(emerg); };
+<% if kernel == 'Linux' %>
# complex filter for messages usually sent to the xconsole
filter f_xconsole {
facility(daemon,mail)
# complex filter for messages usually sent to the xconsole
filter f_xconsole {
facility(daemon,mail)
@@
-198,7
+201,7
@@
filter f_xconsole {
and level(crit,err,notice));
};
and level(crit,err,notice));
};
-
+<% end %>
######
# logs
# order matters if you use "flags(final);" to mark the end of processing in a
######
# logs
# order matters if you use "flags(final);" to mark the end of processing in a
@@
-347,6
+350,7
@@
log {
};
};
+<% if kernel == 'Linux' %>
# daemon.*;mail.*;\
# news.crit;news.err;news.notice;\
# *.=debug;*.=info;\
# daemon.*;mail.*;\
# news.crit;news.err;news.notice;\
# *.=debug;*.=info;\
@@
-356,4
+360,4
@@
log {
filter(f_xconsole);
destination(dp_xconsole);
};
filter(f_xconsole);
destination(dp_xconsole);
};
-
+<%end%>