projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
[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
23f5393
..
20f0cfc
100644
(file)
--- a/
modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/
modules/syslog-ng/templates/syslog-ng.conf.erb
@@
-399,7
+399,6
@@
log {
<%- end -%>
-<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
<%- if hostname != "heininen" -%>
destination loghost-heininen {
tcp("heininen.debian.org" port (5140)
@@
-430,7
+429,6
@@
log {
destination(loghost-lotti);
<%- end -%>
};
-<%- end -%>