Fixing debian config

diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp
index 658e208cf7e97223cb81b5fdb7e236e4e169dc41..d709bd97deb890a63365193f79cf9a533b4db6ca 100644 (file)
--- 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 773d84d5d99cffa7a1f948b650cd7bd9464ae925..8a2e9116d657b8fd9416cfafae89ed8d2971c6ab 100644 (file)
--- 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 1c2c37d4bb2ca456fd754e96d962ea6013afcc7a..f682216dfdaf8ba23de5e4d403cdbcdd43b20bb1 100644 (file)
--- 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 b337d5b5d2c0d0b6513fe89a5e05e6f8c0e00d05..3d0e50777eab653974b0b7e9ba1994427a00f54e 100644 (file)
--- 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 }
     }