From 6ef393a9864338c2e1085fa80283e8fda848685e Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 15 Apr 2013 09:32:04 +0200 Subject: [PATCH] cleanup that should not change anything --- modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb | 2 +- modules/unbound/templates/unbound.conf.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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| -%> -- 2.20.1