From 110c37f7d1c315c67b267fa52839fbf8be4e4520 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 30 Jun 2011 20:43:26 -0300
Subject: [PATCH] Fixing debian config

---
 manifests/client/debian.pp     | 2 +-
 manifests/{host => }/debian.pp | 2 +-
 manifests/egd/debian.pp        | 2 +-
 manifests/init.pp              | 6 ++++--
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename manifests/{host => }/debian.pp (91%)

diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp
index 658e208..d709bd9 100644
--- a/manifests/client/debian.pp
+++ b/manifests/client/debian.pp
@@ -1,3 +1,3 @@
-class ekeyd::cliend::debian {
+class ekeyd::cliend::debian inherits ekeyd::cliend::base {
   include ekeyd::egd::debian
 }
diff --git a/manifests/host/debian.pp b/manifests/debian.pp
similarity index 91%
rename from manifests/host/debian.pp
rename to manifests/debian.pp
index 773d84d..8a2e911 100644
--- a/manifests/host/debian.pp
+++ b/manifests/debian.pp
@@ -1,4 +1,4 @@
-class ekeyd::host::debian inherits ekeyd::host::base {
+class ekeyd::debian inherits ekeyd::base {
   package { "usbutils": ensure => installed }
 
   if ( $virtual == "vserver" ) or ( $virtual == "xenu" ) {
diff --git a/manifests/egd/debian.pp b/manifests/egd/debian.pp
index 1c2c37d..f682216 100644
--- a/manifests/egd/debian.pp
+++ b/manifests/egd/debian.pp
@@ -1,4 +1,4 @@
-class egd::debian inherits ekeyd::egd {
+class ekeyd::egd::debian inherits ekeyd::egd {
   if ( $virtual == "vserver" ) {
     fail("This class shouldn't be included on vservers")
   }
diff --git a/manifests/init.pp b/manifests/init.pp
index b337d5b..3d0e507 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,12 +5,14 @@ class ekeyd(
 
   if $ekeyd_key_present != 'true' { fail("Can't find an ekey key plugged into usb on ${fqdn}") }
 
-  include ekeyd::base
+  case $operatingsystem {
+    debian: { include ekeyd::debian }
+    default: { include ekeyd::base }
+  }
 
   if $ekeyd_host {
     case $operatingsystem {
       centos: { include ekeyd::host::centos }
-      debian: { include ekeyd::host::debian }
       default: { include ekeyd::host::base }
     }
 
-- 
2.39.5