projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new udd cert
[mirror/dsa-puppet.git]
/
modules
/
syslog-ng
/
templates
/
syslog-ng.conf.erb
diff --git
a/modules/syslog-ng/templates/syslog-ng.conf.erb
b/modules/syslog-ng/templates/syslog-ng.conf.erb
index
62cdc5c
..
98c2fb2
100644
(file)
--- a/
modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/
modules/syslog-ng/templates/syslog-ng.conf.erb
@@
-1,8
+1,13
@@
<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
@version: 3.0
<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
@version: 3.0
+<%- elsif has_variable?("syslogversion") and syslogversion.to_s == "3.5" -%>
+@version: 3.5
+@include "scl.conf"
<%- else -%>
@version: 3.3
<%- else -%>
@version: 3.3
+@include "scl.conf"
<%- end -%>
<%- end -%>
+
##
## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
##
## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
@@
-102,18
+107,14
@@
options {
source s_local {
# message generated by Syslog-NG
internal();
source s_local {
# message generated by Syslog-NG
internal();
-<%- if
kernel == 'Linux'
-%>
+<%- 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 -%>
# 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 -%>
- # standard Linux log source (this is the default place for the syslog()
- # function to send logs to)
- unix-dgram("/var/run/log");
- # messages from the kernel
- file("/dev/klog" program_override("kernel: ") follow-freq(1));
+ system();
<%- end -%>
};
<%- end -%>
};
@@
-434,7
+435,7
@@
log {
<%- if hostname != "lully" -%>
destination(loghost-lully);
<%- end -%>
<%- if hostname != "lully" -%>
destination(loghost-lully);
<%- end -%>
- <%- if hostname != "loghost
01
-grnet-01" -%>
+ <%- if hostname != "loghost-grnet-01" -%>
destination(loghost-loghost-grnet-01);
<%- end -%>
};
destination(loghost-loghost-grnet-01);
<%- end -%>
};