projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ferm: add syncproxy.na.debian.org IPv6
[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
dc2babe
..
7733374
100644
(file)
--- a/
modules/resolv/templates/resolv.conf.erb
+++ b/
modules/resolv/templates/resolv.conf.erb
@@
-10,12
+10,12
@@
searchpaths << "debian.org" -%>
search <%= searchpaths.to_a.flatten.join(" ") %>
<%
nameservers = []
search <%= searchpaths.to_a.flatten.join(" ") %>
<%
nameservers = []
-if %w{draghi}.include?(hostname)
+if %w{draghi}.include?(
@
hostname)
nameservers << "127.0.0.1"
end
nameservers += @ns
nameservers << "127.0.0.1"
end
nameservers += @ns
-if @unbound
&& @unbound == "true"
+if @unbound
nameservers = ['127.0.0.1']
end
nameservers = ['127.0.0.1']
end