diff options
| author | Marcel Haerry <haerry@puzzle.ch> | 2009-05-25 10:53:10 +0200 |
|---|---|---|
| committer | Marcel Haerry <haerry@puzzle.ch> | 2009-05-25 10:53:10 +0200 |
| commit | c1af334f136fe24ad1a544142dfa8ffed1325657 (patch) | |
| tree | b2394a525b7a1cd74335abe6767f7b63a763a5fd /templates | |
| parent | 4a235226de70fed2c1679c4ec8a432b4c74a65cd (diff) | |
| parent | 1c77a21234e5ba32f4a7c03c727e3e20119784c3 (diff) | |
merged with immerda
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/resolvconf.OpenBSD.erb | 5 | ||||
| -rw-r--r-- | templates/resolvconf.erb | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/templates/resolvconf.OpenBSD.erb b/templates/resolvconf.OpenBSD.erb new file mode 100644 index 0000000..27c2a69 --- /dev/null +++ b/templates/resolvconf.OpenBSD.erb @@ -0,0 +1,5 @@ +# managed by puppet +lookup file bind +<%- resolvconf_nameservers.split(':').each do |nameserver| -%> +nameserver <%= nameserver %> +<%- end -%> diff --git a/templates/resolvconf.erb b/templates/resolvconf.erb index 0bc467f..c9a43cc 100644 --- a/templates/resolvconf.erb +++ b/templates/resolvconf.erb @@ -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 %> +<%- end -%> |