From d8aca73440d02619cfc16d1b9524152fbe603a49 Mon Sep 17 00:00:00 2001 From: andreas Date: Mon, 10 Mar 2008 13:21:57 +0000 Subject: umwandlung in class, und def. von variablen --- templates/resolvconf.erb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 templates/resolvconf.erb (limited to 'templates/resolvconf.erb') diff --git a/templates/resolvconf.erb b/templates/resolvconf.erb new file mode 100644 index 0000000..58efe73 --- /dev/null +++ b/templates/resolvconf.erb @@ -0,0 +1,8 @@ +# managed by puppet + +domain <%= real_resolvconf_domain %> +search <%= real_resolvconf_search %> +nameserver1 <%= real_resolvconf_nameserver1 %> +nameserver2 <%= real_resolvconf_nameserver2 %> +nameserver3 <%= real_resolvconf_nameserver3 %> + -- cgit v1.2.3 From be0237d2bd0944c6673c2f95c1a6fde8a0fc1703 Mon Sep 17 00:00:00 2001 From: andreas Date: Mon, 28 Apr 2008 08:46:47 +0000 Subject: error in resolv.conf template --- 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 58efe73..5ab3888 100644 --- a/templates/resolvconf.erb +++ b/templates/resolvconf.erb @@ -2,7 +2,7 @@ domain <%= real_resolvconf_domain %> search <%= real_resolvconf_search %> -nameserver1 <%= real_resolvconf_nameserver1 %> -nameserver2 <%= real_resolvconf_nameserver2 %> -nameserver3 <%= real_resolvconf_nameserver3 %> +nameserver <%= real_resolvconf_nameserver1 %> +nameserver <%= real_resolvconf_nameserver2 %> +nameserver <%= real_resolvconf_nameserver3 %> -- cgit v1.2.3 From 433c0fa776449d42894ae5937a35f2bb6b53217a Mon Sep 17 00:00:00 2001 From: andreas Date: Mon, 28 Apr 2008 10:19:54 +0000 Subject: nameservers now as string with ":" as delimiter --- templates/resolvconf.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'templates/resolvconf.erb') diff --git a/templates/resolvconf.erb b/templates/resolvconf.erb index 5ab3888..c961fc6 100644 --- a/templates/resolvconf.erb +++ b/templates/resolvconf.erb @@ -2,7 +2,9 @@ domain <%= real_resolvconf_domain %> search <%= real_resolvconf_search %> -nameserver <%= real_resolvconf_nameserver1 %> -nameserver <%= real_resolvconf_nameserver2 %> -nameserver <%= real_resolvconf_nameserver3 %> + +<% real_resolvconf_nameservers.split(':').each do |val| -%> +nameserver <%= val %> +<% end -%> + -- cgit v1.2.3 From e5110b49fb3f61fbe2d707a44051d1e466c0526d Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 28 Apr 2008 13:48:57 +0000 Subject: added debug statement --- templates/resolvconf.erb | 2 -- 1 file changed, 2 deletions(-) (limited to 'templates/resolvconf.erb') diff --git a/templates/resolvconf.erb b/templates/resolvconf.erb index c961fc6..0bc467f 100644 --- a/templates/resolvconf.erb +++ b/templates/resolvconf.erb @@ -6,5 +6,3 @@ search <%= real_resolvconf_search %> <% real_resolvconf_nameservers.split(':').each do |val| -%> nameserver <%= val %> <% end -%> - - -- cgit v1.2.3 From df62da5a8e588444a01207310188f1e05409a117 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 6 Oct 2008 21:19:04 +0000 Subject: throw away the defaulting immerda specific variables, added a special template for openbsd --- templates/resolvconf.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates/resolvconf.erb') diff --git a/templates/resolvconf.erb b/templates/resolvconf.erb index 0bc467f..f2c17a6 100644 --- a/templates/resolvconf.erb +++ b/templates/resolvconf.erb @@ -1,8 +1,8 @@ # managed by puppet -domain <%= real_resolvconf_domain %> -search <%= real_resolvconf_search %> +domain <%= resolvconf_domain %> +search <%= resolvconf_search %> -<% real_resolvconf_nameservers.split(':').each do |val| -%> -nameserver <%= val %> +<% resolvconf_nameservers.split(':').each do |nameserver| -%> +nameserver <%= nameserver %> <% end -%> -- cgit v1.2.3 From 1c77a21234e5ba32f4a7c03c727e3e20119784c3 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 22 May 2009 23:33:19 +0200 Subject: now new additional lines --- templates/resolvconf.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/resolvconf.erb') diff --git a/templates/resolvconf.erb b/templates/resolvconf.erb index f2c17a6..ca7bce7 100644 --- a/templates/resolvconf.erb +++ b/templates/resolvconf.erb @@ -3,6 +3,6 @@ domain <%= resolvconf_domain %> search <%= resolvconf_search %> -<% resolvconf_nameservers.split(':').each do |nameserver| -%> +<%- resolvconf_nameservers.split(':').each do |nameserver| -%> nameserver <%= nameserver %> -<% end -%> +<%- end -%> -- cgit v1.2.3