diff options
| author | mh <mh@immerda.ch> | 2011-10-09 00:27:06 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-10-09 00:27:06 +0200 |
| commit | bff168f1aad2a82e4b2fec5ca9b8260164cf7e27 (patch) | |
| tree | 00993e7b114b1fd70d698b2d101a3de14d5d29c9 | |
| parent | dfd70b673871cadc0ef1e9ebc659d0f799edb271 (diff) | |
this options should be set globally
| -rw-r--r-- | manifests/include/mod_fcgid.pp | 5 | ||||
| -rw-r--r-- | manifests/vhost/modperl.pp | 2 | ||||
| -rw-r--r-- | manifests/vhost/php/standard.pp | 1 | ||||
| -rw-r--r-- | templates/vhosts/default.erb | 3 |
4 files changed, 8 insertions, 3 deletions
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' -%> <IfModule mod_fcgid.c> 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 %> </IfModule> |