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

1 files changed, 19 insertions, 2 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index bf0fef7..b3b780d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,9 +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
+  }
 }