searchpaths = []
options = []
-if %w{draghi liszt spohr}.include?(hostname)
+if %w{draghi liszt}.include?(hostname)
nameservers << "127.0.0.1"
end
-nameservers += nodeinfo['hoster']['nameservers'] if nodeinfo['hoster']['nameservers']
-searchpaths += nodeinfo['hoster']['searchpaths'] if nodeinfo['hoster']['searchpaths']
-options += nodeinfo['hoster']['resolvoptions'] if nodeinfo['hoster']['resolvoptions']
+nameservers += scope.lookupvar('ns')
+searchpaths += scope.lookupvar('site::nodeinfo')['hoster']['searchpaths'] if scope.lookupvar('site::nodeinfo')['hoster']['searchpaths']
+options += scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions'] if scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions']
searchpaths << "debian.org"
nameservers << '8.8.4.4'
end
- nameservers.each do |ns|
+ nameservers.to_a.flatten.each do |ns|
resolvconf += "nameserver " + ns + "\n"
end
end