Merge branch 'make_passenger_tempdir_configurable' of https://github.com/yo61/puppetmodule into yo61-make_passenger_tempdir_configurable

Conflicts:
	manifests/master.pp

Add rake tests and make it so tempdir is only set if we pass a variable. So this doesn't break backward compatibility.

Author: stephenrjohnson

manifests/master.pp

@@ -74,6 +74,7 @@
   $puppet_docroot             = $::puppet::params::puppet_docroot,
   $puppet_vardir              = $::puppet::params::puppet_vardir,
   $puppet_passenger_port      = $::puppet::params::puppet_passenger_port,
+  $puppet_passenger_tempdir   = false,
   $puppet_master_package      = $::puppet::params::puppet_master_package,
   $puppet_master_service      = $::puppet::params::puppet_master_service,
   $version                    = 'present',
@@ -132,6 +133,7 @@
     conf_dir              => $::puppet::params::confdir,
     dns_alt_names         => join($dns_alt_names,','),
     generate_ssl_certs    => $generate_ssl_certs,
+    puppet_passenger_tempdir => $puppet_passenger_tempdir,
   } ->
   Anchor['puppet::master::end']
 

manifests/passenger.pp

@@ -34,6 +34,7 @@
 class puppet::passenger(
   $generate_ssl_certs = true,
   $puppet_passenger_port,
+  $puppet_passenger_tempdir = false,
   $puppet_docroot,
   $apache_serveradmin,
   $puppet_conf,

spec/classes/puppet_passenger_spec.rb

@@ -43,6 +43,10 @@
                     :group  => 'puppet',
                     :mode   => '0755'
                 )
+                should contain_file('puppet_passenger.conf').with(
+                    :ensure => 'file',
+                )
+                should contain_file('puppet_passenger.conf').without_content(/PassengerTempDir/)
                 should contain_file('/etc/puppet/rack').with(
                     :ensure => 'directory',
                     :owner  => 'puppet',
@@ -74,17 +78,43 @@
         }
     end
     context 'on Redhat' do
-        let(:facts) do
-            {
-                :osfamily               => 'Redhat',
-                :operatingsystem        => 'Redhat',
-                :operatingsystemrelease => '5',
-                :concat_basedir         => '/dne',
-            }
-        end
-         it {
-                should contain_file('/var/lib/puppet/reports')
-                should contain_file('/var/lib/puppet/ssl/ca/requests')
+      let(:facts) do
+        {
+          :osfamily               => 'Redhat',
+          :operatingsystem        => 'Redhat',
+          :operatingsystemrelease => '5',
+          :concat_basedir         => '/dne',
+        }
+      end
+      it {
+        should contain_file('/var/lib/puppet/reports')
+        should contain_file('/var/lib/puppet/ssl/ca/requests')
+      }
+    end
+    context 'on Redhat with tempdir' do
+      let(:facts) do
+        {
+          :osfamily               => 'Redhat',
+          :operatingsystem        => 'Redhat',
+          :operatingsystemrelease => '5',
+          :concat_basedir         => '/dne',
+        }
+      end
+      let (:params) do
+        {
+          :puppet_passenger_port    => '8140',
+          :puppet_docroot           => '/etc/puppet/rack/public/',
+          :apache_serveradmin       => 'root',
+          :puppet_conf              => '/etc/puppet/puppet.conf',
+          :puppet_ssldir            => '/var/lib/puppet/ssl',
+          :certname                 => 'test.test.com',
+          :conf_dir                 => '/etc/puppet',
+          :dns_alt_names            => ['puppet'],
+          :puppet_passenger_tempdir => '/tmp/passenger',
         }
+      end
+      it {
+        should contain_file('puppet_passenger.conf').with_content(/PassengerTempDir/)
+      }
     end
 end

templates/puppet_passenger.conf.erb

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