From f2ed8f04e48e9f878f25ed78daf2509e8029d6d9 Mon Sep 17 00:00:00 2001 From: am Date: Mon, 10 Mar 2008 11:51:43 +0000 Subject: new module to create resolv.conf git-svn-id: https://svn/ipuppet/trunk/modules/resolvconf@1053 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/init.pp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 manifests/init.pp diff --git a/manifests/init.pp b/manifests/init.pp new file mode 100644 index 0000000..50043ae --- /dev/null +++ b/manifests/init.pp @@ -0,0 +1,27 @@ +# modules/resolvconf/manifests/init.pp - manage resolvconf stuff +# Copyright (C) 2007 admin@immerda.ch +# GPLv3 + +# modules_dir { "resolvconf": } + +define resolveconf ( + $domain='glei.ch', + $search='glei.ch', + $nameserver1='212.103.67.60', + $nameserver2='212.103.72.231', + $nameserver3='192.168.1.104' +) { + $str = "search $search +domain $domain +nameserver $nameserver1 +nameserver $nameserver2 +nameserver $nameserver3 +" + + file { "/etc/resolv.conf": + content => $str + } +} + + + -- cgit v1.2.3 From eb2b476b22d675c2117da4b5bddae1f07ab4eee9 Mon Sep 17 00:00:00 2001 From: am Date: Mon, 10 Mar 2008 11:53:59 +0000 Subject: =?UTF-8?q?resolv.conf=20f=C3=BCr=20immer1-6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn/ipuppet/trunk/modules/resolvconf@1054 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/init.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 50043ae..e444480 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,7 +4,9 @@ # modules_dir { "resolvconf": } -define resolveconf ( +class resolvconf {} + +define resolvconf::create ( $domain='glei.ch', $search='glei.ch', $nameserver1='212.103.67.60', -- cgit v1.2.3 From 248c5af0e05478fb7f3b38f8c4b438a88cdc105b Mon Sep 17 00:00:00 2001 From: am Date: Mon, 10 Mar 2008 13:21:57 +0000 Subject: umwandlung in class, und def. von variablen git-svn-id: https://svn/ipuppet/trunk/modules/resolvconf@1057 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/init.pp | 48 ++++++++++++++++++++++++++++++------------------ templates/resolvconf.erb | 8 ++++++++ 2 files changed, 38 insertions(+), 18 deletions(-) create mode 100644 templates/resolvconf.erb diff --git a/manifests/init.pp b/manifests/init.pp index e444480..58dc83f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,25 +4,37 @@ # modules_dir { "resolvconf": } -class resolvconf {} - -define resolvconf::create ( - $domain='glei.ch', - $search='glei.ch', - $nameserver1='212.103.67.60', - $nameserver2='212.103.72.231', - $nameserver3='192.168.1.104' -) { - $str = "search $search -domain $domain -nameserver $nameserver1 -nameserver $nameserver2 -nameserver $nameserver3 -" - - file { "/etc/resolv.conf": - content => $str +class resolvconf { + $real_resolvconf_domain = $resolvconf_domain ? { + '' => 'glei.ch', + default => $resolvconf_domain, } + $real_resolvconf_search = $resolvconf_search ? { + '' => 'glei.ch', + default => $resolvconf_search, + } + $real_resolvconf_nameserver1 = $resolvconf_nameserver1 ? { + '' => '212.103.67.60', + default => $resolvconf_nameserver1, + } + $real_resolvconf_nameserver2 = $resolvconf_nameserver2 ? { + '' => '212.103.72.231', + default => $resolvconf_nameserver2, + } + $real_resolvconf_nameserver3 = $resolvconf_nameserver3 ? { + '' => '192.168.1.104', + default => $resolvconf_nameserver3, + } + + file { '/etc/resolv.conf': + path => '/etc/resolv.conf', + owner => root, + group => 0, + mode => 444, + content => template("resolvconf/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 3a774db0deb373f6c171a0b58538da3e0129bd6f Mon Sep 17 00:00:00 2001 From: am Date: Mon, 28 Apr 2008 08:46:47 +0000 Subject: error in resolv.conf template git-svn-id: https://svn/ipuppet/trunk/modules/resolvconf@1301 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- templates/resolvconf.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 a0bc9552fc601a8c92fa6ae75870c646e851bad1 Mon Sep 17 00:00:00 2001 From: am Date: Mon, 28 Apr 2008 10:19:54 +0000 Subject: nameservers now as string with ":" as delimiter git-svn-id: https://svn/ipuppet/trunk/modules/resolvconf@1304 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/init.pp | 25 +++++++++++++++---------- templates/resolvconf.erb | 8 +++++--- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 58dc83f..31b41e0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,18 +13,23 @@ class resolvconf { '' => 'glei.ch', default => $resolvconf_search, } - $real_resolvconf_nameserver1 = $resolvconf_nameserver1 ? { - '' => '212.103.67.60', + $real_resolvconf_nameservers ? $resolvconf_nameservers ? { + '' => '212.103.67.60:212.103.67.61:212.103.72.231:192.168.1.104', default => $resolvconf_nameserver1, } - $real_resolvconf_nameserver2 = $resolvconf_nameserver2 ? { - '' => '212.103.72.231', - default => $resolvconf_nameserver2, - } - $real_resolvconf_nameserver3 = $resolvconf_nameserver3 ? { - '' => '192.168.1.104', - default => $resolvconf_nameserver3, - } + +# $real_resolvconf_nameserver1 = $resolvconf_nameserver1 ? { +# '' => '212.103.67.60', +# default => $resolvconf_nameserver1, +# } +# $real_resolvconf_nameserver2 = $resolvconf_nameserver2 ? { +# '' => '212.103.72.231', +# default => $resolvconf_nameserver2, +# } +# $real_resolvconf_nameserver3 = $resolvconf_nameserver3 ? { +# '' => '192.168.1.104', +# default => $resolvconf_nameserver3, +# } file { '/etc/resolv.conf': path => '/etc/resolv.conf', 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 451a59673dbf24e1b00758c19de7243a656de4b0 Mon Sep 17 00:00:00 2001 From: am Date: Mon, 28 Apr 2008 10:42:20 +0000 Subject: typo git-svn-id: https://svn/ipuppet/trunk/modules/resolvconf@1305 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 31b41e0..8891a4e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,9 +13,9 @@ class resolvconf { '' => 'glei.ch', default => $resolvconf_search, } - $real_resolvconf_nameservers ? $resolvconf_nameservers ? { + $real_resolvconf_nameservers = $resolvconf_nameservers ? { '' => '212.103.67.60:212.103.67.61:212.103.72.231:192.168.1.104', - default => $resolvconf_nameserver1, + default => $resolvconf_nameservers, } # $real_resolvconf_nameserver1 = $resolvconf_nameserver1 ? { -- cgit v1.2.3 From c85e160f1d728394cebbdb93cf153e5bbbd19b8e Mon Sep 17 00:00:00 2001 From: am Date: Mon, 28 Apr 2008 12:06:28 +0000 Subject: resolv.conf generation for all the config::immerda hosts, some are special git-svn-id: https://svn/ipuppet/trunk/modules/resolvconf@1306 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 8891a4e..586275a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -14,7 +14,7 @@ class resolvconf { default => $resolvconf_search, } $real_resolvconf_nameservers = $resolvconf_nameservers ? { - '' => '212.103.67.60:212.103.67.61:212.103.72.231:192.168.1.104', + '' => '212.103.67.60:212.103.67.61', default => $resolvconf_nameservers, } -- cgit v1.2.3 From fc2541ce4a298e55d5929887d35fa95a0d933b57 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 28 Apr 2008 13:48:57 +0000 Subject: added debug statement git-svn-id: https://svn/ipuppet/trunk/modules/resolvconf@1311 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/init.pp | 14 +------------- templates/resolvconf.erb | 2 -- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 586275a..3784594 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,24 +13,12 @@ class resolvconf { '' => 'glei.ch', default => $resolvconf_search, } + notice("real_resolvconf_nameservers: $real_resolvconf_nameservers") $real_resolvconf_nameservers = $resolvconf_nameservers ? { '' => '212.103.67.60:212.103.67.61', default => $resolvconf_nameservers, } -# $real_resolvconf_nameserver1 = $resolvconf_nameserver1 ? { -# '' => '212.103.67.60', -# default => $resolvconf_nameserver1, -# } -# $real_resolvconf_nameserver2 = $resolvconf_nameserver2 ? { -# '' => '212.103.72.231', -# default => $resolvconf_nameserver2, -# } -# $real_resolvconf_nameserver3 = $resolvconf_nameserver3 ? { -# '' => '192.168.1.104', -# default => $resolvconf_nameserver3, -# } - file { '/etc/resolv.conf': path => '/etc/resolv.conf', owner => root, 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 fa199fa9b4a0abab8d9666a1b0457aca431bbbf1 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 28 Apr 2008 13:53:25 +0000 Subject: fixed debug statement, now correct output git-svn-id: https://svn/ipuppet/trunk/modules/resolvconf@1313 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 3784594..178710e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,7 +13,7 @@ class resolvconf { '' => 'glei.ch', default => $resolvconf_search, } - notice("real_resolvconf_nameservers: $real_resolvconf_nameservers") + notice("resolvconf_nameservers: $resolvconf_nameservers") $real_resolvconf_nameservers = $resolvconf_nameservers ? { '' => '212.103.67.60:212.103.67.61', default => $resolvconf_nameservers, -- cgit v1.2.3 From 7f9bdb11ca9048e36e9d24ad0c7597e6ac99a5d7 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 28 Apr 2008 14:51:00 +0000 Subject: removed debug statement git-svn-id: https://svn/ipuppet/trunk/modules/resolvconf@1320 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/init.pp | 1 - 1 file changed, 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 178710e..fb57059 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,7 +13,6 @@ class resolvconf { '' => 'glei.ch', default => $resolvconf_search, } - notice("resolvconf_nameservers: $resolvconf_nameservers") $real_resolvconf_nameservers = $resolvconf_nameservers ? { '' => '212.103.67.60:212.103.67.61', default => $resolvconf_nameservers, -- cgit v1.2.3