diff options
| author | Antoine Beaupré <anarcat@koumbit.org> | 2015-07-17 13:42:10 -0400 |
|---|---|---|
| committer | Antoine Beaupré <anarcat@koumbit.org> | 2015-07-17 13:42:10 -0400 |
| commit | 400add98326c8664db71a3138b0ec7b2948fb2e6 (patch) | |
| tree | 62a15bd1ae7d66f59fc876ec96236e67904e03d5 | |
| parent | f656ae3328c1df7d8ea45ac7c0183e6f5805732c (diff) | |
allow appending arbitrary stuff to the resolv.conf
this is useful in Linux to add an 'options' line
| -rw-r--r-- | manifests/init.pp | 3 | ||||
| -rw-r--r-- | templates/resolvconf.OpenBSD.erb | 4 | ||||
| -rw-r--r-- | templates/resolvconf.erb | 4 |
3 files changed, 10 insertions, 1 deletions
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 -%> |