summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/client/debian.pp2
-rw-r--r--manifests/debian.pp (renamed from manifests/host/debian.pp)2
-rw-r--r--manifests/egd/debian.pp2
-rw-r--r--manifests/init.pp6
4 files changed, 7 insertions, 5 deletions
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
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 }
}