merged with immerda
authorMarcel Haerry <haerry@puzzle.ch>
Mon, 25 May 2009 08:53:10 +0000 (10:53 +0200)
committerMarcel Haerry <haerry@puzzle.ch>
Mon, 25 May 2009 08:53:10 +0000 (10:53 +0200)
1  2 
templates/resolvconf.erb

@@@ -1,8 -1,8 +1,7 @@@
  # managed by puppet
 -
+ domain <%= resolvconf_domain %>
+ search <%= resolvconf_search %>
  
- domain <%= real_resolvconf_domain %>
- search <%= real_resolvconf_search %>
- <% real_resolvconf_nameservers.split(':').each do |val| -%> 
- nameserver <%= val %> 
- <% end -%>
 -<%- resolvconf_nameservers.split(':').each do |nameserver| -%> 
 -nameserver <%= nameserver %> 
++<%- resolvconf_nameservers.split(':').each do |nameserver| -%>
++nameserver <%= nameserver %>
+ <%- end -%>