From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 15 Apr 2013 07:32:04 +0000 (+0200)
Subject: cleanup that should not change anything
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6ef393a9864338c2e1085fa80283e8fda848685e;p=mirror%2Fdsa-puppet.git

cleanup that should not change anything
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index 745ad05b8..303dfd213 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -40,7 +40,7 @@ module Puppet::Parser::Functions
       end
 
       ns = function_hiera('nameservers')
-      if not ns or ns.empty?
+      if ns.empty?
         # no nameservers known for this hoster
         nodeinfo['misc']['resolver-recursive'] = true
 
diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb
index 17683a862..d919f384f 100644
--- a/modules/unbound/templates/unbound.conf.erb
+++ b/modules/unbound/templates/unbound.conf.erb
@@ -45,7 +45,7 @@ server:
 	auto-trust-anchor-file: "/var/lib/unbound/debian.org.key"
 
 # recursive: <%= @is_recursor ? "y" : "n" %>
-<% if (not @is_recursor) and (not @ns.empty?) -%>
+<% if not @is_recursor -%>
 forward-zone:
 	name: "."
 <% @ns.to_a.flatten.each do |nms| -%>