puppet_agent.pp: puppet agent Cron-Aufruf in Templates, Logrotate-Update

files/etc/logrotate.d/puppet-agent

@@ -4,6 +4,5 @@
         daily
         missingok
         notifempty
-        delaycompress
         compress
 }

manifests/puppet_agent.pp

@@ -11,21 +11,20 @@ class ubuntu_server::puppet_agent($nightly_only=false,$on_reboot_once=true){
     }
 
     if $nightly_only == true {
-        file{'/etc/cron.d/puppet-cron':
-            ensure  => present,
-            content => "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\n${puppet_cron_time},${puppet_cron_time_plus_30} 2-5/1 * * * root puppet agent --verbose --no-daemonize --onetime --show_diff --no-usecacheonfailure --no-splay --ignorecache --logdest syslog\n",
-        } -> Service['puppet']
+        $nightly_hours = '2-5/1'
     } else {
-        file{'/etc/cron.d/puppet-cron':
-            ensure  => present,
-            content => "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\n${puppet_cron_time},${puppet_cron_time_plus_30} * * * * root puppet agent --verbose --no-daemonize --onetime --show_diff --no-usecacheonfailure --no-splay --ignorecache --logdest syslog\n",
-        } -> Service['puppet']
+        $nightly_hours = '*'
     }
 
+    file{'/etc/cron.d/puppet-cron':
+        ensure  => present,
+        content => template('ubuntu_server/etc/cron.d/puppet-cron.erb'),
+    } -> Service['puppet']
+
     if $on_reboot_once == true {
         file{'/etc/cron.d/puppet-cron-reboot':
             ensure  => present,
-            content => "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\n@reboot root sleep 3m ; puppet agent --verbose --no-daemonize --onetime --show_diff --no-usecacheonfailure --no-splay --ignorecache --logdest syslog\n",
+            content => template('ubuntu_server/etc/cron.d/puppet-cron-reboot.erb'),
         } -> Service['puppet']
     }
 

templates/etc/cron.d/puppet-cron-reboot.erb

+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+@reboot root sleep 3m ; puppet agent --verbose --no-daemonize --onetime --show_diff --no-usecacheonfailure --no-splay --ignorecache --logdest syslog
\ No newline at end of file

templates/etc/cron.d/puppet-cron.erb

+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+<%= @puppet_cron_time %>,<%= @puppet_cron_time_plus_30 %> <%= @nightly_hours %> * * * root puppet agent --verbose --no-daemonize --onetime --show_diff --no-usecacheonfailure --no-splay --ignorecache --logdest syslog