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 server alias for $location.$archive.backend.mirrors.debian.org
[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
bb8770a
..
551b7db
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,24
+107,20
@@
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 -%>
};
<%- if (hostname == "lotti") || (hostname == "lully") || (hostname == "loghost-grnet-01") -%>
source s_network {
<%- end -%>
};
<%- if (hostname == "lotti") || (hostname == "lully") || (hostname == "loghost-grnet-01") -%>
source s_network {
- tcp6(port(5140) max-connections(
2
00)
+ tcp6(port(5140) max-connections(
4
00)
tls( key_file("/etc/exim4/ssl/thishost.key")
cert_file("/etc/exim4/ssl/thishost.crt")
ca_dir("/etc/exim4/ssl/")
tls( key_file("/etc/exim4/ssl/thishost.key")
cert_file("/etc/exim4/ssl/thishost.crt")
ca_dir("/etc/exim4/ssl/")
@@
-398,7
+399,7
@@
log {
<%- if hostname != "lotti" -%>
destination loghost-lotti {
tcp("lotti.debian.org" port (5140)
<%- if hostname != "lotti" -%>
destination loghost-lotti {
tcp("lotti.debian.org" port (5140)
- tls( key_file("/etc/ssl/
debian/keys
/thishost.key")
+ tls( key_file("/etc/ssl/
private
/thishost.key")
cert_file("/etc/ssl/debian/certs/thishost.crt")
ca_dir("/etc/ssl/debian/certs/")
)
cert_file("/etc/ssl/debian/certs/thishost.crt")
ca_dir("/etc/ssl/debian/certs/")
)
@@
-408,7
+409,7
@@
destination loghost-lotti {
<%- if hostname != "lully" -%>
destination loghost-lully {
tcp("lully.debian.org" port (5140)
<%- if hostname != "lully" -%>
destination loghost-lully {
tcp("lully.debian.org" port (5140)
- tls( key_file("/etc/ssl/
debian/keys
/thishost.key")
+ tls( key_file("/etc/ssl/
private
/thishost.key")
cert_file("/etc/ssl/debian/certs/thishost.crt")
ca_dir("/etc/ssl/debian/certs/")
)
cert_file("/etc/ssl/debian/certs/thishost.crt")
ca_dir("/etc/ssl/debian/certs/")
)
@@
-418,7
+419,7
@@
destination loghost-lully {
<%- if hostname != "loghost-grnet-01" -%>
destination loghost-loghost-grnet-01 {
tcp("loghost-grnet-01.debian.org" port (5140)
<%- if hostname != "loghost-grnet-01" -%>
destination loghost-loghost-grnet-01 {
tcp("loghost-grnet-01.debian.org" port (5140)
- tls( key_file("/etc/ssl/
debian/keys
/thishost.key")
+ tls( key_file("/etc/ssl/
private
/thishost.key")
cert_file("/etc/ssl/debian/certs/thishost.crt")
ca_dir("/etc/ssl/debian/certs/")
)
cert_file("/etc/ssl/debian/certs/thishost.crt")
ca_dir("/etc/ssl/debian/certs/")
)