ntp: removed paths for execs, puppet: subclassed gentoo stuff

1 files changed, 18 insertions, 12 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index ace5939..7f1abd4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,7 +6,11 @@
 
 class puppet {
     case $kernel {
-        linux: { include puppet::linux}
+        linux: { case $operatingsystem {
+                    gentoo:  { include puppet::gentoo }
+                    default: { include puppet::linux}
+                 }
+        }
         openbsd: { include puppet::openbsd}
     }
 
@@ -32,27 +36,17 @@ class puppet {
 
 class puppet::linux {
     package{'puppet':
-        name => 'puppet',
-        category => $operatingsystem ? {
-            gentoo => 'app-admin',
-            default => '',
-        },
         ensure => present,
     }
 
     package{'facter':
-        name => 'facter',
-        category => $operatingsystem ? {
-            gentoo => 'dev-ruby',
-            default => '',
-        },
         ensure => present,
     }
 
     service{'puppet':
         ensure => running,
         enable => true,
-        #hasstatus => true,
+        hasstatus => true,
         require => Package[puppet],
     }
 
@@ -66,6 +60,18 @@ class puppet::linux {
         ],
     }
 }
+class puppet::gentoo inherits puppet::linux {
+    Package[puppet]{
+        category => 'app-admin',
+    }
+    Package[facter]{
+        category => 'dev-ruby',
+    }
+    # as we use sometimes the init script to test
+    Service[puppet]{
+        hasstatus => false,
+    }
+}
 class puppet::openbsd {
     service{'puppet':
         provider => base,