From 991c3aa7aa2dfa10f3b34a1158774abf7614461b Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 15 Aug 2014 17:34:17 +0200 Subject: improve handling if we don't have a domain --- templates/resolvconf.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'templates/resolvconf.erb') diff --git a/templates/resolvconf.erb b/templates/resolvconf.erb index d8136bf..cbd10dd 100644 --- a/templates/resolvconf.erb +++ b/templates/resolvconf.erb @@ -1,7 +1,7 @@ # managed by puppet -domain <%= scope.lookupvar('resolvconf::domain') %> -search <%= scope.lookupvar('resolvconf::search') %> +<% if @domain -%>domain <%= @domain %><% end -%> +<% if @search -%>search <%= @search %><% end -%> -<% scope.lookupvar('resolvconf::nameservers').each do |nameserver| -%> +<% Array(@nameservers).each do |nameserver| -%> nameserver <%= nameserver %> <% end -%> -- cgit v1.2.3