From bff168f1aad2a82e4b2fec5ca9b8260164cf7e27 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 9 Oct 2011 00:27:06 +0200 Subject: this options should be set globally --- manifests/include/mod_fcgid.pp | 5 +++++ manifests/vhost/modperl.pp | 2 ++ manifests/vhost/php/standard.pp | 1 + templates/vhosts/default.erb | 3 --- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 manifests/include/mod_fcgid.pp diff --git a/manifests/include/mod_fcgid.pp b/manifests/include/mod_fcgid.pp new file mode 100644 index 0000000..2dd415a --- /dev/null +++ b/manifests/include/mod_fcgid.pp @@ -0,0 +1,5 @@ +class apache::include::mod_fcgid { + apache::config::global{'mod_fcgid': + content => "FcgidFixPathinfo 1\n" + } +} \ No newline at end of file diff --git a/manifests/vhost/modperl.pp b/manifests/vhost/modperl.pp index 4f5dff7..7cbe578 100644 --- a/manifests/vhost/modperl.pp +++ b/manifests/vhost/modperl.pp @@ -91,6 +91,8 @@ define apache::vhost::modperl( } 'fcgid': { include ::mod_fcgid + apache::include::mod_fcgid + # we don't need mod_perl if we run it as fcgid include ::mod_perl::disable mod_fcgid::starter {$name: diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index bb6c5e1..c3c9e7a 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -188,6 +188,7 @@ define apache::vhost::php::standard( 'fcgid': { include ::mod_fcgid include ::php::mod_fcgid + apache::include::mod_fcgid mod_fcgid::starter {$name: cgi_type => 'php', diff --git a/templates/vhosts/default.erb b/templates/vhosts/default.erb index 4328931..98482d4 100644 --- a/templates/vhosts/default.erb +++ b/templates/vhosts/default.erb @@ -22,9 +22,6 @@ vhost_parts.each do |vhost_part| <% elsif run_mode.to_s == 'fcgid' -%> SuexecUserGroup <%= run_uid+" "+run_gid %> - <% if passing_extension.to_s == 'php' -%> - PHP_Fix_Pathinfo_Enable 1 - <% end -%> FCGIWrapper /var/www/mod_fcgid-starters/<%= name %> .<%= passing_extension %> AddHandler fcgid-script .<%= passing_extension %> -- cgit v1.2.3