Merge remote-tracking branch 'puzzle/master'

1 files changed, 21 insertions, 22 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 77c921f..68c3eb5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,29 +13,28 @@
 #
 
 class resolvconf {
-    case $operatingsystem {
-        openbsd: { info("\$resolvconf_domain and  \$resolvconf_search not needed on openbsd") }
-        default: {
-            case $resolvconf_domain {
-                '': { fail("you need to define \$resolvconf_domain for ${fqdn}") }
-            }
-            case $resolvconf_search {
-                '': { fail("you need to define \$resolvconf_search for ${fqdn}") }
-            }
-        }
+  case $operatingsystem {
+    openbsd: {
+      info('$resolvconf_domain and $resolvconf_search not needed on openbsd')
     }
-    case $resolvconf_nameservers {
-        '': { fail("you need to define \$resolvconf_nameservers for ${fqdn}") }
+    default: {
+      if ! $resolvconf_domain {
+        fail("you need to define \$resolvconf_domain for ${fqdn}")
+      }
+      if ! $resolvconf_search {
+        fail("you need to define \$resolvconf_search for $fqdn")
+      }
     }
-
-    file { '/etc/resolv.conf':
-        path => '/etc/resolv.conf',
-        owner => root,
-        group => 0,
-        mode => 444,
-        content => $operatingsystem ? {
-            openbsd => template("resolvconf/resolvconf.${operatingsystem}.erb"),
-            default => template('resolvconf/resolvconf.erb'),
-        }
+  }
+  if ! $resolvconf_nameservers {
+    fail("you need to define \$resolvconf_nameservers for $fqdn")
+  }
+  file{'/etc/resolv.conf':
+    path => '/etc/resolv.conf',
+    owner => root, group => 0, mode => 0444,
+    content => $operatingsystem ? {
+      openbsd => template("resolvconf/resolvconf.$operatingsystem.erb"),
+      default => template('resolvconf/resolvconf.erb'),
     }
+  }
 }