From: Marcel Haerry <haerry@puzzle.ch>
Date: Tue, 13 May 2008 09:15:43 +0000 (+0200)
Subject: merged with immerda
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6a08dfbf58b8b4039796a3d296339078510c238c;p=puppet-resolvconf.git

merged with immerda
---

6a08dfbf58b8b4039796a3d296339078510c238c
diff --cc manifests/init.pp
index bf71469,fb57059..0f952cc
--- a/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")
+     }
 -
 -
+ }
 -
 -
 -