projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dfd04d2
)
Old syslog-ng is old, take 2. Squeeze-syslog-ng lacks the system plugin
author
Tollef Fog Heen
<tfheen@err.no>
Thu, 27 Nov 2014 16:40:44 +0000
(17:40 +0100)
committer
Tollef Fog Heen
<tfheen@err.no>
Thu, 27 Nov 2014 16:40:44 +0000
(17:40 +0100)
modules/syslog-ng/templates/syslog-ng.conf.erb
patch
|
blob
|
history
diff --git
a/modules/syslog-ng/templates/syslog-ng.conf.erb
b/modules/syslog-ng/templates/syslog-ng.conf.erb
index
4353332
..
98c2fb2
100644
(file)
--- a/
modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/
modules/syslog-ng/templates/syslog-ng.conf.erb
@@
-107,7
+107,15
@@
options {
source s_local {
# message generated by Syslog-NG
internal();
+<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
+ # standard Linux log source (this is the default place for the syslog()
+ # function to send logs to)
+ unix-stream("/dev/log");
+ # messages from the kernel
+ file("/proc/kmsg" program_override("kernel: "));
+<%- else -%>
system();
+<%- end -%>
};
<%- if (hostname == "lotti") || (hostname == "lully") || (hostname == "loghost-grnet-01") -%>