summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp14
-rw-r--r--templates/resolvconf.erb2
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 -%>
-
-