summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Haerry <haerry@puzzle.ch>2008-05-13 11:15:43 +0200
committerMarcel Haerry <haerry@puzzle.ch>2008-05-13 11:15:43 +0200
commit6a08dfbf58b8b4039796a3d296339078510c238c (patch)
tree6c2af8cd3a12cefa8a7d1b43624b5bafc60f4861
parent5e4ef43b56f76a57b93be016d8efa6418cd57760 (diff)
parent7f9bdb11ca9048e36e9d24ad0c7597e6ac99a5d7 (diff)
downloadpuppet-resolvconf-6a08dfbf58b8b4039796a3d296339078510c238c.tar.gz
puppet-resolvconf-6a08dfbf58b8b4039796a3d296339078510c238c.tar.bz2
merged with immerda
-rw-r--r--manifests/init.pp32
-rw-r--r--templates/resolvconf.erb8
2 files changed, 34 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index bf71469..0f952cc 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,9 +1,29 @@
-#######################################
-# resolvconf module
-# Puzzle ITC - haerry+puppet(at)puzzle.ch
+# modules/resolvconf/manifests/init.pp - manage resolvconf stuff
+# Copyright (C) 2007 admin@immerda.ch
# GPLv3
-#######################################
-
+# adapted by Puzzle ITC - haerry+puppet(at)puzzle.ch
# modules_dir { "resolvconf": }
-class resolvconf {}
+
+class resolvconf {
+ $real_resolvconf_domain = $resolvconf_domain ? {
+ '' => 'rz.puzzle.ch',
+ default => $resolvconf_domain,
+ }
+ $real_resolvconf_search = $resolvconf_search ? {
+ '' => 'rz.puzzle.ch.ch',
+ default => $resolvconf_search,
+ }
+ $real_resolvconf_nameservers = $resolvconf_nameservers ? {
+ '' => '195.141.101.81:195.141.101.82',
+ default => $resolvconf_nameservers,
+ }
+
+ 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..0bc467f
--- /dev/null
+++ b/templates/resolvconf.erb
@@ -0,0 +1,8 @@
+# managed by puppet
+
+domain <%= real_resolvconf_domain %>
+search <%= real_resolvconf_search %>
+
+<% real_resolvconf_nameservers.split(':').each do |val| -%>
+nameserver <%= val %>
+<% end -%>