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 (from parent 1:
f113d5f
)
Try something for syslog fu
author
Peter Palfrader
<peter@palfrader.org>
Wed, 28 Jul 2010 09:29:11 +0000
(11:29 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Wed, 28 Jul 2010 09:29:11 +0000
(11:29 +0200)
templates/syslog-ng.conf.erb
patch
|
blob
|
history
diff --git
a/templates/syslog-ng.conf.erb
b/templates/syslog-ng.conf.erb
index
6231a76
..
468fcbb
100644
(file)
--- a/
templates/syslog-ng.conf.erb
+++ b/
templates/syslog-ng.conf.erb
@@
-1,4
+1,4
@@
-<%- if defined? syslogversion
&&
syslogversion.to_s == "3" -%>
+<%- if defined? syslogversion
and
syslogversion.to_s == "3" -%>
@version: 3.0
<%- end -%>
##
@version: 3.0
<%- end -%>
##
@@
-102,7
+102,7
@@
source s_local {
# function to send logs to)
unix-stream("/dev/log");
# messages from the kernel
# function to send logs to)
unix-stream("/dev/log");
# messages from the kernel
-<%- if defined? syslogversion
&&
syslogversion.to_s == "2" -%>
+<%- if defined? syslogversion
and
syslogversion.to_s == "2" -%>
file("/proc/kmsg" log_prefix("kernel: "));
<%- else -%>
file("/proc/kmsg" program_override("kernel: "));
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
# function to send logs to)
unix-dgram("/var/run/log");
# messages from the kernel
-<%- if defined? syslogversion
&&
syslogversion.to_s == "2" -%>
+<%- if defined? syslogversion
and
syslogversion.to_s == "2" -%>
file("/dev/klog" log_prefix("kernel: "));
<%- else -%>
file("/dev/klog" program_override("kernel: "));
file("/dev/klog" log_prefix("kernel: "));
<%- else -%>
file("/dev/klog" program_override("kernel: "));
@@
-404,7
+404,7
@@
log {
<%- if hostname != "heininen" -%>
<%- if hostname != "heininen" -%>
- <%- if defined? syslogversion
&&
syslogversion.to_s == "3" -%>
+ <%- if defined? syslogversion
and
syslogversion.to_s == "3" -%>
destination loghost-heininen {
tcp("heininen.debian.org" port (5140)
tls( key_file("/etc/ssl/debian/keys/thishost.key")
destination loghost-heininen {
tcp("heininen.debian.org" port (5140)
tls( key_file("/etc/ssl/debian/keys/thishost.key")