new style for 2.7

1 files changed, 19 insertions, 5 deletions

diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp
index 7b40da6..42222d6 100644
--- a/manifests/cron/base.pp
+++ b/manifests/cron/base.pp
@@ -1,19 +1,33 @@
 # manifests/cron/base.pp
 class puppet::cron::base inherits puppet::base {
 
-  case $operatingsystem {
-    debian: { if $lsbdistcodename != 'lenny' { $stop_service = true } else { $stop_service = false }  }
+  case $::operatingsystem {
+    debian: { if $::lsbdistcodename != 'lenny' { $stop_service = true } else { $stop_service = false }  }
     openbsd, ubuntu: { $stop_service = false }
     default: { $stop_service = true }
   }
-        
+
+  if !$puppet::cron::cron_time {
+    $crontime_interval_minute = fqdn_rand(29)
+    $crontime_interval_minute2 = inline_template("<%= 30+scope.lookupvar('puppet::cron::cron_time').to_i %>")
+    $crontime = "${crontime_interval_minute},${crontime_interval_minute2} * * * *"
+  } else {
+    $crontime = $puppet::cron::cron_time
+  }
+
+  if $puppet::http_compression {
+     $http_compression_str = '--http_compression'
+  } else {
+    $http_compression_str = ''
+  }
+
   Service['puppet']{
     enable => false,
   }
 
   if $stop_service == true {
-    $puppet_majorversion = regsubst($puppetversion,'^(\d+\.\d+).*$','\1')
-    if $puppet_majorversion == '2.6' {  
+    $puppet_majorversion = regsubst($::puppetversion,'^(\d+\.\d+).*$','\1')
+    if $puppet_majorversion == '2.6' {
       Service['puppet']{
         ensure => stopped,
       }