projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
466e17d
)
order matters
author
Stephen Gran
<steve@lobefin.net>
Mon, 16 Apr 2012 10:26:10 +0000
(11:26 +0100)
committer
Stephen Gran
<steve@lobefin.net>
Mon, 16 Apr 2012 10:26:10 +0000
(11:26 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/resolv/templates/resolv.conf.erb
patch
|
blob
|
history
diff --git
a/modules/resolv/templates/resolv.conf.erb
b/modules/resolv/templates/resolv.conf.erb
index
34ea6af
..
147dfdf
100644
(file)
--- a/
modules/resolv/templates/resolv.conf.erb
+++ b/
modules/resolv/templates/resolv.conf.erb
@@
-15,8
+15,8
@@
end
nameservers += scope.lookupvar('ns')
options += scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions'] if scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions']
-searchpaths << "debian.org"
searchpaths += scope.lookupvar('sp')
+searchpaths << "debian.org"
resolvconf = ''
resolvconf += "search " + searchpaths.to_a.flatten.join(" ") + "\n"