Allow passenger tempdir to be configurable

Author: robinbowes

manifests/master.pp

@@ -73,6 +73,7 @@
   $puppet_docroot             = $::puppet::params::puppet_docroot,
   $puppet_vardir              = $::puppet::params::puppet_vardir,
   $puppet_passenger_port      = $::puppet::params::puppet_passenger_port,
+  $puppet_passenger_tempdir   = $::puppet::params::puppet_passenger_tempdir,
   $puppet_master_package      = $::puppet::params::puppet_master_package,
   $puppet_master_service      = $::puppet::params::puppet_master_service,
   $version                    = 'present',
@@ -121,14 +122,15 @@
 
   Anchor['puppet::master::begin'] ->
   class {'puppet::passenger':
-    puppet_passenger_port  => $puppet_passenger_port,
-    puppet_docroot         => $puppet_docroot,
-    apache_serveradmin     => $apache_serveradmin,
-    puppet_conf            => $::puppet::params::puppet_conf,
-    puppet_ssldir          => $puppet_ssldir,
-    certname               => $certname,
-    conf_dir               => $::puppet::params::confdir,
-    dns_alt_names          => join($dns_alt_names,','),
+    puppet_passenger_port    => $puppet_passenger_port,
+    puppet_passenger_tempdir => $puppet_passenger_tempdir,
+    puppet_docroot           => $puppet_docroot,
+    apache_serveradmin       => $apache_serveradmin,
+    puppet_conf              => $::puppet::params::puppet_conf,
+    puppet_ssldir            => $puppet_ssldir,
+    certname                 => $certname,
+    conf_dir                 => $::puppet::params::confdir,
+    dns_alt_names            => join($dns_alt_names,','),
   } ->
   Anchor['puppet::master::end']
 

manifests/params.pp

@@ -24,6 +24,7 @@
   $hiera_config                     = '/etc/puppet/hiera.yaml'
   $puppet_docroot                   = '/etc/puppet/rack/public/'
   $puppet_passenger_port            = '8140'
+  $puppet_passenger_tempdir         = '/var/run/rubygem-passenger'
   $puppet_server_port               = '8140'
   $puppet_agent_enabled             = true
   $apache_serveradmin               = 'root'

manifests/passenger.pp

@@ -32,6 +32,7 @@
 #
 class puppet::passenger(
   $puppet_passenger_port,
+  $puppet_passenger_tempdir,
   $puppet_docroot,
   $apache_serveradmin,
   $puppet_conf,

templates/puppet_passenger.conf.erb

@@ -4,4 +4,4 @@ PassengerPoolIdleTime 1500
 PassengerStatThrottleRate 120
 RackAutoDetect Off
 RailsAutoDetect Off
-PassengerTempDir /var/run/rubygem-passenger
+PassengerTempDir <%= @puppet_passenger_tempdir %>