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 745ad05b8c5adfa508c31f93d0da87ba3e59b5ec..303dfd21392685b4a7fdb9af3ba08e3de6762686 100644 (file)
--- 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 17683a862031792d90df99eacccf35fa0cf57b7f..d919f384fc916d6a964cd0b6733f2bb927a98585 100644 (file)
--- 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| -%>