From: Stephen Gran <steve@lobefin.net>
Date: Mon, 13 Sep 2010 07:22:29 +0000 (+0100)
Subject: try to break syslog
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=848287c0ca9cd4531cf24def93f4220d54e7b245;p=mirror%2Fdsa-puppet.git

try to break syslog

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/templates/syslog-ng.conf.erb b/templates/syslog-ng.conf.erb
index ac1e3f310..8ea828d69 100644
--- a/templates/syslog-ng.conf.erb
+++ b/templates/syslog-ng.conf.erb
@@ -403,8 +403,8 @@ log {
 <%- end -%>
 
 
-<%- if (hostname != "heininen") && (hostname != "lotti") -%>
- <%- if has_variable?("syslogversion") and syslogversion.to_s == "3" -%>
+<%- if has_variable?("syslogversion") and syslogversion.to_s == "3" -%>
+  <%- if hostname != "heininen" -%>
 destination loghost-heininen {
 	tcp("heininen.debian.org" port (5140)
 		tls( key_file("/etc/ssl/debian/keys/thishost.key")
@@ -413,6 +413,8 @@ destination loghost-heininen {
 		)
 	);
 };
+ <%- end -%>
+ <%- if hostname != "lotti" -%>
 destination loghost-lotti {
 	tcp("lotti.debian.org" port (5140)
 		tls( key_file("/etc/ssl/debian/keys/thishost.key")
@@ -421,14 +423,17 @@ destination loghost-lotti {
 		)
 	);
 };
-
+ <%- end -%>
 
 log {
 	source(s_local);
+ <%- if hostname != "heininen" -%> 
 	destination(loghost-heininen);
+ <%- end -%>
+ <%- if hostname != "lotti" -%>
 	destination(loghost-lotti);
-};
  <%- end -%>
+};
 <%- end -%>