diff options
| author | mh <mh@immerda.ch> | 2011-10-08 22:27:37 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-10-08 22:27:37 +0200 |
| commit | 391dbaae8af22cf6f157aa4f741762a14cf0b483 (patch) | |
| tree | 45f6b3b2d88b4acd133481e32cc7ef471b7ddc17 /manifests/vhost | |
| parent | 7991a88483f214d593a933ce97fc8a2adf44800e (diff) | |
add mod_fcgid stuff
Diffstat (limited to 'manifests/vhost')
| -rw-r--r-- | manifests/vhost/modperl.pp | 23 | ||||
| -rw-r--r-- | manifests/vhost/php/standard.pp | 24 |
2 files changed, 35 insertions, 12 deletions
diff --git a/manifests/vhost/modperl.pp b/manifests/vhost/modperl.pp index 9940286..795df6b 100644 --- a/manifests/vhost/modperl.pp +++ b/manifests/vhost/modperl.pp @@ -83,12 +83,25 @@ define apache::vhost::modperl( mode => $documentroot_mode; } - case $run_mode { - 'proxy-itk','static-itk': { - $passing_extension = 'pl' - include ::mod_perl::itk_plus + $passing_extension = 'pl' + if $ensure != 'absent' { + case $run_mode { + 'proxy-itk','static-itk': { + include ::mod_perl::itk_plus + } + 'fcgid': { + include ::mod_fcgid + # we don't need mod_perl if we run it as fcgid + include ::mod_perl::disable + mod_fcgid::starter {$name: + type => 'perl', + owner => $run_uid, + group => $run_gid, + notify => Service['apache'], + } + } + default: { include ::mod_perl } } - default: { include ::mod_perl } } # create webdir diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index 723ae3f..878e55c 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -64,15 +64,25 @@ define apache::vhost::php::standard( $htpasswd_path = 'absent' ){ - case $run_mode { - 'proxy-itk','static-itk': { - $passing_extension = 'php' - include ::php::itk_plus + $passing_extension = 'php' + if $ensure != 'absent' { + case $run_mode { + 'proxy-itk','static-itk': { + include ::php::itk_plus + } + 'itk': { include ::php::itk } + 'fcgid': { + include ::php::mod_fcgid + mod_fcgid::starter {$name: + type => 'php', + owner => $run_uid, + group => $run_gid, + notify => Service['apache'], + } + } + default: { include ::php } } - 'itk': { include ::php::itk } - default: { include ::php } } - if $manage_webdir { # create webdir ::apache::vhost::webdir{$name: |