summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp20
-rw-r--r--templates/resolvconf.OpenBSD.erb5
-rw-r--r--templates/resolvconf.erb8
3 files changed, 19 insertions, 14 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 1f5f986..a14f01b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -15,17 +15,14 @@
# modules_dir { "resolvconf": }
class resolvconf {
- $real_resolvconf_domain = $resolvconf_domain ? {
- '' => 'glei.ch',
- default => $resolvconf_domain,
+ case $reseolvconf_domain {
+ '': { fail("you need to define \$reseolvconf_domain for ${fqdn}") }
}
- $real_resolvconf_search = $resolvconf_search ? {
- '' => 'glei.ch',
- default => $resolvconf_search,
+ $resolvconf_search {
+ '': { fail("you need to define \$reseolvconf_search for ${fqdn}") }
}
- $real_resolvconf_nameservers = $resolvconf_nameservers ? {
- '' => '212.103.67.60:212.103.67.61',
- default => $resolvconf_nameservers,
+ $resolvconf_nameservers {
+ '': { fail("you need to define \$reseolvconf_nameservers for ${fqdn}") }
}
file { '/etc/resolv.conf':
@@ -33,6 +30,9 @@ class resolvconf {
owner => root,
group => 0,
mode => 444,
- content => template("resolvconf/resolvconf.erb")
+ content => $operatingsystem ? {
+ openbsd => template("resolvconf/resolvconf.${operatingsystem}.erb"),
+ default => template('resolvconf/resolvconf.erb'),
+ }
}
}
diff --git a/templates/resolvconf.OpenBSD.erb b/templates/resolvconf.OpenBSD.erb
new file mode 100644
index 0000000..945284e
--- /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..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 -%>