Merge branch 'dschaaff-mac_support'

Author: stephenrjohnson

manifests/agent.pp

@@ -151,10 +151,13 @@
 
   if $puppet_run_style == 'service' {
     $startonboot = 'yes'
+    $daemonize   = true
   }
   else {
     $startonboot = 'no'
+    $daemonize = false
   }
+  
 
   if ($::osfamily == 'Debian' and $puppet_run_style != 'manual') or ($::osfamily == 'Redhat') {
     file { $puppet::params::puppet_defaults:
@@ -165,6 +168,14 @@
       content => template("puppet/${puppet::params::puppet_defaults}.erb"),
     }
   }
+  elsif $::osfamily == 'Darwin' {
+    file {'/Library/LaunchDaemons/com.puppetlabs.puppet.plist':
+      mode    => '0644',
+      owner   => 'root',
+      group   => 'wheel',
+      content => template('puppet/launchd/com.puppetlabs.puppet.plist.erb'),
+    }
+  }
 
   if ! defined(File[$::puppet::params::confdir]) {
     file { $::puppet::params::confdir:
@@ -525,4 +536,4 @@
       value   => $serialization_format,
     }
   }
-}
+}

manifests/master.pp

@@ -386,4 +386,4 @@
     }
   }
   anchor { 'puppet::master::end': }
-}
+}

manifests/params.pp

@@ -96,9 +96,12 @@
     }
     'Darwin': {
       $puppet_agent_service         = 'com.puppetlabs.puppet'
-      $puppet_agent_package         = 'puppet-3.8.5.dmg'
-      $puppet_facter_package        = 'facter-2.4.5.dmg'
+      $puppet_agent_package         = 'puppet-3.8.6.dmg'
+      $puppet_facter_package        = 'facter-2.4.6.dmg'
       $package_provider             = 'pkgdmg'
+      $puppet_conf                  = '/etc/puppet/puppet.conf'
+      $puppet_vardir                = '/var/lib/puppet'
+      $puppet_ssldir                = '/var/lib/puppet/ssl'
     }
     default: {
       err('The Puppet module does not support your os')

manifests/passenger.pp

@@ -202,4 +202,4 @@
     value   => 'SSL_CLIENT_VERIFY',
     require => File[$puppet_conf],
   }
-}
+}

templates/launchd/com.puppetlabs.puppet.plist.erb

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Disabled</key>
+	<true/>
+	<key>Label</key>
+	<string>com.puppetlabs.puppet</string>
+	<key>OnDemand</key>
+	<false/>
+	<key>ProgramArguments</key>
+	<array>
+		<string>/usr/bin/puppet</string>
+		<string>agent</string>
+		<%- if @puppet_run_style == "service" -%>
+		<string>daemonize</string>
+                <%- else -%>
+                <string>no-daemonize</string> 
+                <%- end -%>
+		<string>--logdest</string>
+		<string>syslog</string>
+		<string>--color</string>
+		<string>false</string>
+	</array>
+	<key>RunAtLoad</key>
+	<true/>
+	<key>ServiceDescription</key>
+	<string>Puppet agent service</string>
+	<key>ServiceIPC</key>
+	<false/>
+</dict>
+</plist>