Setup defaults for 4 and 3 puppet

Author: cwood

manifests/params.pp

@@ -43,9 +43,13 @@
    if versioncmp($::puppetversion, "4.0.0") >= 0 {
     $puppet_conf        = '/etc/puppetlabs/puppet/puppet.conf'
     $puppet_run_command = '/opt/puppetlabs/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1'
+    $puppet_vardir                = '/opt/puppetlabs/server/data/puppetserver'
+    $puppet_ssldir                = '/etc/puppetlabs/puppet/ssl'
   } else {
     $puppet_conf        = '/etc/puppet/puppet.conf'
     $puppet_run_command = '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1'
+    $puppet_vardir                = '/var/lib/puppet'
+    $puppet_ssldir                = '/var/lib/puppet/ssl'
   }
 
   case $::osfamily {
@@ -56,8 +60,6 @@
       $puppet_agent_package         = 'puppet'
       $package_provider                 = undef # falls back to system default
       $puppet_defaults              = '/etc/sysconfig/puppet'
-      $puppet_vardir                = '/var/lib/puppet'
-      $puppet_ssldir                = '/var/lib/puppet/ssl'
       $passenger_package            = 'mod_passenger'
       $rack_package                 = 'rubygem-rack'
       $ruby_dev                     = 'ruby-devel'
@@ -68,8 +70,6 @@
       $puppet_agent_service         = 'puppet'
       $puppet_agent_package         = 'puppet'
       $package_provider                 = undef # falls back to system default
-      $puppet_vardir                = '/var/lib/puppet'
-      $puppet_ssldir                = '/var/lib/puppet/ssl'
       $passenger_package            = 'rubygem-passenger-apache2'
       $rack_package                 = 'rubygem-rack'
     }
@@ -80,8 +80,6 @@
       $puppet_agent_package         = 'puppet'
       $package_provider                 = undef # falls back to system default
       $puppet_defaults              = '/etc/default/puppet'
-      $puppet_vardir                = '/var/lib/puppet'
-      $puppet_ssldir                = '/var/lib/puppet/ssl'
       $passenger_package            = 'libapache2-mod-passenger'
       $rack_package                 = 'librack-ruby'
       $ruby_dev                     = 'ruby-dev'
@@ -91,16 +89,12 @@
       $puppet_agent_package         = 'sysutils/puppet'
       $package_provider                 = undef # falls back to system default
       $puppet_conf                  = '/usr/local/etc/puppet/puppet.conf'
-      $puppet_vardir                = '/var/puppet'
-      $puppet_ssldir                = '/var/puppet/ssl'
     }
     'Darwin': {
       $puppet_agent_service         = 'com.puppetlabs.puppet'
       $puppet_agent_package         = 'puppet-3.8.5.dmg'
       $puppet_facter_package        = 'facter.2.4.5.dmg'
       $package_provider             = 'pkgdmg'
-      $puppet_vardir                = '/var/lib/puppet'
-      $puppet_ssldir                = '/etc/puppet/ssl'
     }
     default: {
       err('The Puppet module does not support your os')