]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
try to break syslog
authorStephen Gran <steve@lobefin.net>
Mon, 13 Sep 2010 07:22:29 +0000 (08:22 +0100)
committerStephen Gran <steve@lobefin.net>
Mon, 13 Sep 2010 07:22:29 +0000 (08:22 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
templates/syslog-ng.conf.erb

index ac1e3f31091716f76587e3d3d99074febea6fd44..8ea828d69b89da9ee743031baa20b7e3560ae067 100644 (file)
@@ -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 -%>