From 52d1e0785346f5c3bac17797d48305996cd1f202 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 16 Apr 2012 11:31:02 +0100 Subject: [PATCH] and options Signed-off-by: Stephen Gran --- modules/resolv/manifests/init.pp | 5 +++-- modules/resolv/templates/resolv.conf.erb | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/resolv/manifests/init.pp b/modules/resolv/manifests/init.pp index 225c93c9..3447733a 100644 --- a/modules/resolv/manifests/init.pp +++ b/modules/resolv/manifests/init.pp @@ -1,7 +1,8 @@ class resolv { - $ns = hiera('nameservers') - $sp = hiera('searchpaths') + $ns = hiera('nameservers') + $sp = hiera('searchpaths') + $opts = hiera('resolvoptions') file { '/etc/resolv.conf': content => template('resolv/resolv.conf.erb'); diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb index 147dfdf0..a5291bfa 100644 --- a/modules/resolv/templates/resolv.conf.erb +++ b/modules/resolv/templates/resolv.conf.erb @@ -6,19 +6,19 @@ <%= nameservers = [] searchpaths = [] -options = [] +options = [] +resolvconf = '' if %w{draghi liszt}.include?(hostname) nameservers << "127.0.0.1" end nameservers += scope.lookupvar('ns') -options += scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions'] if scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions'] - searchpaths += scope.lookupvar('sp') +options += scope.lookupvar('opts') + searchpaths << "debian.org" -resolvconf = '' resolvconf += "search " + searchpaths.to_a.flatten.join(" ") + "\n" if has_variable?('unbound') and unbound and unbound == "true" @@ -36,7 +36,7 @@ else end end -options.each do |opt| +options.to_a.flatten.each do |opt| resolvconf += "options " + opt + "\n" end -- 2.39.2