From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 21 Oct 2009 16:31:25 +0000 (+0200)
Subject: And this?
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=13ea8372c42d1000f3fbf1ab3e3a8a0c41ff9690;p=mirror%2Fdsa-puppet.git

And this?
---

diff --git a/modules/munin-node/templates/munin-node.plugin.conf.erb b/modules/munin-node/templates/munin-node.plugin.conf.erb
index 4f3d3ed97..0a3f2c9af 100644
--- a/modules/munin-node/templates/munin-node.plugin.conf.erb
+++ b/modules/munin-node/templates/munin-node.plugin.conf.erb
@@ -19,7 +19,7 @@ group adm, maillog
 user root
 <%=
 out = ""
-if mta and mta == "exim4"
+if has_variable?("mta") and mta == "exim4"
   out="
 [exim_mail*]
 user Debian-exim
@@ -52,7 +52,7 @@ env.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf
 
 <%=
 out = ""
-if mta and mta == "postfix"
+if has_variable?("mta") and mta == "postfix"
   out="
 [postfix_mailqueue]
 user postfix