From 400add98326c8664db71a3138b0ec7b2948fb2e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Fri, 17 Jul 2015 13:42:10 -0400 Subject: allow appending arbitrary stuff to the resolv.conf this is useful in Linux to add an 'options' line --- manifests/init.pp | 3 ++- templates/resolvconf.OpenBSD.erb | 4 ++++ templates/resolvconf.erb | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index c85b959..28e2fec 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -18,7 +18,8 @@ class resolvconf( $nameservers = [ '77.109.138.45', '77.109.139.29', - ] + ], + $options, ) { $content = $::operatingsystem ? { openbsd => template("resolvconf/resolvconf.${::operatingsystem}.erb"), diff --git a/templates/resolvconf.OpenBSD.erb b/templates/resolvconf.OpenBSD.erb index f8727d7..9cf2902 100644 --- a/templates/resolvconf.OpenBSD.erb +++ b/templates/resolvconf.OpenBSD.erb @@ -3,3 +3,7 @@ lookup file bind <% Array(@nameservers).each do |nameserver| -%> nameserver <%= nameserver %> <% end -%> + +<% if @tail -%> +<%= tail %> +<% end -%> diff --git a/templates/resolvconf.erb b/templates/resolvconf.erb index 2a1f1e8..d11327d 100644 --- a/templates/resolvconf.erb +++ b/templates/resolvconf.erb @@ -9,3 +9,7 @@ search <%= @search %> <% Array(@nameservers).each do |nameserver| -%> nameserver <%= nameserver %> <% end -%> + +<% if @tail -%> +<%= tail %> +<% end -%> -- cgit v1.2.3