From 594431cf80a3a56cda904228f36bd236d9606ab5 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sat, 23 May 2009 00:33:38 +0100 Subject: [PATCH] Some syntax things Signed-off-by: Stephen Gran --- files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb | 2 +- modules/exim/templates/eximconf.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb index 64e94dbd1..84e5bc996 100644 --- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb +++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb @@ -31,7 +31,7 @@ module Puppet::Parser::Functions results['mail_port'] = '' results['smarthost'] = '' - results['heavy_exim'] = "" + results['heavy_exim'] = '' results['smarthost_port'] = 587 results['reservedaddrs'] = '0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5' diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index b5c4d4e7e..be08938db 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -86,7 +86,7 @@ out <%= out='' -if not nodeinfo['heavy_exim'].empty? +if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty? out = " perl_startup = do '/etc/exim4/exim_surbl.pl' " @@ -836,7 +836,7 @@ out <%= out='' -if not nodeinfo['heavy_exim'].empty? +if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty? out=' deny condition = ${if <{$message_size}{256000}} set acl_m5 = ${perl{surblspamcheck}} -- 2.20.1