From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 17 Apr 2013 07:11:40 +0000 (+0200)
Subject: Try to make manifest work with new hieradata
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e05673fceab5b68e33fb5ed4661ede6217fb919e;p=dsa-puppet.git

Try to make manifest work with new hieradata
---

diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp
index caf95027..08f3e4ac 100644
--- a/modules/unbound/manifests/init.pp
+++ b/modules/unbound/manifests/init.pp
@@ -55,7 +55,7 @@ class unbound {
 		notify  => Service['unbound']
 	}
 
-	if ($is_recursor and $client_ranges) {
+	if ($is_recursor and not $client_ranges.empty?) {
 		@ferm::rule { 'dsa-dns':
 			domain      => 'ip',
 			description => 'Allow nameserver access',
diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb
index d919f384..4da955ff 100644
--- a/modules/unbound/templates/unbound.conf.erb
+++ b/modules/unbound/templates/unbound.conf.erb
@@ -6,7 +6,7 @@
 server:
 	verbosity: 1
 
-<% if @is_recursor && @client_ranges -%>
+<% if @is_recursor && not @client_ranges.empty? -%>
 	interface: 0.0.0.0
 	interface: ::0