Merge branch 'master' of git://git.puppet.immerda.ch/module-ekeyd

diff --cc manifests/init.pp
index bf0fef7b757014eca85973a35451926be3851452,204d877b75173e5201e731434d4884287257c981..b3b780dcdd8fc67b4c6f2c5702eec8c361cbe7ce
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -1,9 -1,24 +1,26 @@@
- class ekeyd {
+ class ekeyd(
+   $ekeyd_host = false,
+   $ekeyd_masterkey
+ ){
  
 +  package { "usbutils": ensure => installed }
 + 
    if $ekeyd_key_present != 'true' { fail("Can't find an ekey key plugged into usb on ${fqdn}") }
-   if !$ekey_masterkey { fail("You need to define \$ekey_masterkey for ${fqdn}") }
  
    include ekeyd::base
+ 
+   if $ekeyd_host {
+     case $operatingsystem {
+       centos: { include ekeyd::host::centos }
+       default: { include ekeyd::host::base }
+     }
+ 
+     if $use_shorewall {
+       include shorewall::rules::ekeyd
+     }
+   }
+ 
+   if $use_munin {
+     include ekeyd::munin
+   }
  }