Fix for #24

example42 · Jan 12, 2013 · f035570 · f035570
1 parent 7851c37
commit f035570
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -463,8 +463,8 @@
     default =>  $puppet::bool_absent ? {
       true    => 'stopped',
       default => $puppet::runmode ? {
-        cron    => undef,
-        manual  => undef,
+        cron    => 'stopped',
+        manual  => 'stopped',
         service => 'running',
       },
     },

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -90,8 +90,8 @@
   $service_server_autorestart = false
 
   $basedir = $::operatingsystem ? {
-      /(?i:RedHat|Centos|Scientific|Fedora)/ => '/usr/lib/ruby/site_ruby/1.8/puppet',
-      default                                => '/usr/lib/ruby/1.8/puppet',
+    /(?i:RedHat|Centos|Scientific|Fedora)/ => '/usr/lib/ruby/site_ruby/1.8/puppet',
+    default                                => '/usr/lib/ruby/1.8/puppet',
   }
 
   $run_dir = $::operatingsystem ? {
@@ -115,7 +115,10 @@
   }
 
   $service_status = $::operatingsystem ? {
-    debian  => false,
+    debian  => $::lsbmajdistrelease ? { 
+      5       => false,
+      default => true,
+    },
     default => true,
   }