Test OS properly, tidy up Params file

GregSutcliffe · May 11, 2012 · 7ab5f90 · 7ab5f90
1 parent fa8e935
commit 7ab5f90
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -1,22 +1,21 @@
 class dhcp::params {
 
-    $dhcp_dir = $operatingsystem ? {
-        debian  => "/etc/dhcp",
-        ubuntu  => "/etc/dhcp",
-        darwin  => "/opt/local/etc/dhcp",
-        default => "/etc",
-    }
+  $dhcp_dir = $operatingsystem ? {
+    Ubuntu,debian => "/etc/dhcp",
+    darwin        => "/opt/local/etc/dhcp",
+    default       => "/etc",
+  }
 
-    $packagename = $operatingsystem ? {
-      darwin  => "dhcp",
-      Ubuntu  => "dhcp3-server",
-      default => "isc-dhcp-server",
-    }
+  $packagename = $operatingsystem ? {
+    Ubuntu,Ubuntu => "dhcp3-server",
+    darwin        => "dhcp",
+    default       => "isc-dhcp-server",
+  }
 
-    $servicename = $operatingsystem ? {
-      darwin  => "org.macports.dhcpd",
-      Ubuntu  => "isc-dhcp-server",
-      default => "isc-dhcp-server",
-    }
+  $servicename = $operatingsystem ? {
+    darwin        => "org.macports.dhcpd",
+    Ubuntu,Debian => "isc-dhcp-server",
+    default       => "isc-dhcp-server",
+  }
 
 }