diff options
| author | mh <mh@immerda.ch> | 2014-05-25 17:27:21 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-05-25 17:27:21 +0200 |
| commit | 0bbe37a35fe98d67c2c25989d9585e31e42dc3c0 (patch) | |
| tree | 23643e9112f7f5f0f432d7a15e41811aede594b8 /manifests | |
| parent | 02cfba03d2439b26dce8c37210dcbb85196fb5f4 (diff) | |
integrate php54 from scl support
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/vhost/php/standard.pp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index 69d0fa8..8498a82 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -46,6 +46,7 @@ define apache::vhost::php::standard( $allow_override = 'None', $php_settings = {}, $php_options = {}, + $php_installation = 'system', $do_includes = false, $options = 'absent', $additional_options = 'absent', @@ -61,7 +62,7 @@ define apache::vhost::php::standard( $vhost_source = 'absent', $vhost_destination = 'absent', $htpasswd_file = 'absent', - $htpasswd_path = 'absent' + $htpasswd_path = 'absent', ){ if $manage_webdir { @@ -188,8 +189,11 @@ define apache::vhost::php::standard( upload_tmp_dir => "/var/www/upload_tmp_dir/${name}", 'session.save_path' => "/var/www/session.save_path/${name}", safe_mode => $::operatingsystem ? { - debian => undef, - default => 'On', + debian => undef, + default => $php_installation ? { + 'system' => 'On', + default => undef, + } }, error_log => $php_error_log, safe_mode_gid => $safe_mode_gid, @@ -219,6 +223,13 @@ define apache::vhost::php::standard( group => $run_gid, notify => Service['apache'], } + if $php_installation == 'scl54' { + require php::scl::php54 + Mod_fcgid::Starter[$name]{ + binary => '/opt/rh/php54/root/usr/bin/php-cgi', + additional_cmds => 'source /opt/rh/php54/enable', + } + } } default: { include ::php } } |