Merge branch 'master' of github.com:stephenrjohnson/puppetmodule

Author: stephenrjohnson

manifests/agent.pp

@@ -10,6 +10,7 @@
 #   ['version']               - The version of the puppet agent to install
 #   ['puppet_run_style']      - The run style of the agent either 'service', 'cron', 'external' or 'manual'
 #   ['puppet_run_interval']   - The run interval of the puppet agent in minutes, default is 30 minutes
+#   ['puppet_run_command']    - The command that will be executed for puppet agent run
 #   ['user_id']               - The userid of the puppet user
 #   ['group_id']              - The groupid of the puppet group
 #   ['splay']                 - If splay should be enable defaults to false
@@ -48,6 +49,7 @@
   $version                = 'present',
   $puppet_run_style       = 'service',
   $puppet_run_interval    = 30,
+  $puppet_run_command     = '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1',
   $user_id                = undef,
   $group_id               = undef,
   $splay                  = false,
@@ -128,7 +130,7 @@
       $time2  =  fqdn_rand($puppet_run_interval) + 30
 
       cron { 'puppet-client':
-        command => '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1',
+        command => $puppet_run_command,
         user    => 'root',
         # run twice an hour, at a random minute in order not to collectively stress the puppetmaster
         hour    => '*',

manifests/passenger.pp

@@ -46,26 +46,23 @@
   include apache::mod::ssl
 
   if $::osfamily == 'redhat' {
-    file{'/var/lib/puppet/reports':
+    file { '/var/lib/puppet/reports':
       ensure => directory,
       owner  => $::puppet::params::puppet_user,
       group  => $::puppet::params::puppet_group,
-      mode   => '0750',
     }
 
-    file{"${puppet_ssldir}/ca":
+    file { "${puppet_ssldir}/ca":
       ensure => directory,
       owner  => $::puppet::params::puppet_user,
       group  => $::puppet::params::puppet_group,
-      mode   => '0770',
       before => Exec['Certificate_Check'],
     }
 
-    file{"${puppet_ssldir}/ca/requests":
+    file { "${puppet_ssldir}/ca/requests":
       ensure => directory,
       owner  => $::puppet::params::puppet_user,
       group  => $::puppet::params::puppet_group,
-      mode   => '0750',
       before => Exec['Certificate_Check'],
     }
   }