From 968676d43da076d4ecc9d33c4a5f8a2fb532285c Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 8 Oct 2011 23:44:15 +0200
Subject: pass php_settings to fcgid-starter and only set them in vhost, if we
 don't run as fgcid

---
 manifests/vhost/php/standard.pp | 42 +++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

(limited to 'manifests/vhost/php')

diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index 4b01d32..7de2798 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -64,26 +64,6 @@ define apache::vhost::php::standard(
     $htpasswd_path = 'absent'
 ){
 
-    $passing_extension = 'php'
-    if $ensure != 'absent' {
-      case $run_mode {
-        'proxy-itk','static-itk': {
-          include ::php::itk_plus
-        }
-        'itk': { include ::php::itk }
-        'fcgid': {
-          include ::mod_fcgid
-          include ::php::mod_fcgid
-          mod_fcgid::starter {$name:
-            cgi_type => 'php',
-            owner => $run_uid,
-            group => $run_gid,
-            notify => Service['apache'],
-          }
-        }
-        default: { include ::php }
-      }
-    }
     if $manage_webdir {
       # create webdir
       ::apache::vhost::webdir{$name:
@@ -188,6 +168,28 @@ define apache::vhost::php::standard(
     
     $real_php_settings = merge($std_php_settings,$php_settings)
     
+    $passing_extension = 'php'
+    if $ensure != 'absent' {
+      case $run_mode {
+        'proxy-itk','static-itk': {
+          include ::php::itk_plus
+        }
+        'itk': { include ::php::itk }
+        'fcgid': {
+          include ::mod_fcgid
+          include ::php::mod_fcgid
+          mod_fcgid::starter {$name:
+            cgi_type => 'php',
+            cgi_type_options => $real_php_settings,
+            owner => $run_uid,
+            group => $run_gid,
+            notify => Service['apache'],
+          }
+        }
+        default: { include ::php }
+      }
+    }
+
     ::apache::vhost::phpdirs{"${name}":
         ensure => $ensure,
         php_upload_tmp_dir => $real_php_settings[upload_tmp_dir],
-- 
cgit v1.2.3