merged with immerda

diff --cc manifests/init.pp
index bf714697d439a89691fe254f21eec11efcb11295,fb570594ab6a53ccd7e8f5a3a9551ad3d81c74ca..0f952ccfa70bb9feb0afea7922f2fd2507a3b378
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -1,9 -1,33 +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 ? {
 -        ''  => 'glei.ch',
++        ''  => 'rz.puzzle.ch',
+         default => $resolvconf_domain,
+     }
+     $real_resolvconf_search = $resolvconf_search ? {
 -        ''  => 'glei.ch',
++        ''  => 'rz.puzzle.ch.ch',
+         default => $resolvconf_search,
+     }
+     $real_resolvconf_nameservers = $resolvconf_nameservers ? {
 -        ''  => '212.103.67.60:212.103.67.61',
++        ''  => '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")
+     }
 -
 -
+ }
 -
 -
 -