X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fresolv%2Ftemplates%2Fresolv.conf.erb;h=f4257666e32a6e904f4572185fe6c491d2f187b6;hb=69c19f570b0c7668d1374600a5a7cedaa81fbe2d;hp=4e9f7650c588e0c184acbea08ad07c1cc2258f2d;hpb=5c6109f1d1fe490d5c725f2706644e88574f0b41;p=dsa-puppet.git diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb index 4e9f7650..f4257666 100644 --- a/modules/resolv/templates/resolv.conf.erb +++ b/modules/resolv/templates/resolv.conf.erb @@ -12,9 +12,9 @@ if %w{draghi liszt widor spohr samosa}.include?(hostname) nameservers << "127.0.0.1" end -nameservers += hosterinfo['nameservers'] if hosterinfo['nameservers'] -searchpaths += hosterinfo['searchpaths'] if hosterinfo['searchpaths'] -options += hosterinfo['resolvoptions'] if hosterinfo['resolvoptions'] +nameservers += nodeinfo['hoster']['nameservers'] if nodeinfo['hoster']['nameservers'] +searchpaths += nodeinfo['hoster']['searchpaths'] if nodeinfo['hoster']['searchpaths'] +options += nodeinfo['hoster']['resolvoptions'] if nodeinfo['hoster']['resolvoptions'] searchpaths << "debian.org"