From: Marcel Haerry <haerry@puzzle.ch>
Date: Mon, 25 May 2009 08:53:10 +0000 (+0200)
Subject: merged with immerda
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c1af334f136fe24ad1a544142dfa8ffed1325657;p=puppet-resolvconf.git

merged with immerda
---

c1af334f136fe24ad1a544142dfa8ffed1325657
diff --cc templates/resolvconf.erb
index 0bc467f,ca7bce7..c9a43cc
--- a/templates/resolvconf.erb
+++ b/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 -%>