diff options
| author | mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279> | 2008-04-28 13:48:57 +0000 |
|---|---|---|
| committer | mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279> | 2008-04-28 13:48:57 +0000 |
| commit | fc2541ce4a298e55d5929887d35fa95a0d933b57 (patch) | |
| tree | 9cc1d358a5236618a7b70090e2845a5a30a34fd9 | |
| parent | c85e160f1d728394cebbdb93cf153e5bbbd19b8e (diff) | |
| download | puppet-resolvconf-fc2541ce4a298e55d5929887d35fa95a0d933b57.tar.gz puppet-resolvconf-fc2541ce4a298e55d5929887d35fa95a0d933b57.tar.bz2 | |
added debug statement
git-svn-id: https://svn/ipuppet/trunk/modules/resolvconf@1311 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
| -rw-r--r-- | manifests/init.pp | 14 | ||||
| -rw-r--r-- | templates/resolvconf.erb | 2 |
2 files changed, 1 insertions, 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 -%> - - |