projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
The trick for merge options to work is to use lookup() rather than hiera()
[mirror/dsa-puppet.git]
/
modules
/
resolv
/
templates
/
resolv.conf.erb
diff --git
a/modules/resolv/templates/resolv.conf.erb
b/modules/resolv/templates/resolv.conf.erb
index
6f70f48
..
6e02dbb
100644
(file)
--- a/
modules/resolv/templates/resolv.conf.erb
+++ b/
modules/resolv/templates/resolv.conf.erb
@@
-16,7
+16,7
@@
end
%>
<% if @searchpaths.size() > 0 %>
-search <%= @searchpaths.join(" ") %>
debian.org
+search <%= @searchpaths.join(" ") %>
<% end -%>
<%= nameservers.map{ |ns| "nameserver #{ns}"}.join("\n") %>