diff --git a/manifests/mpm.pp b/manifests/mpm.pp index 2b33634f2..a5cca4988 100644 --- a/manifests/mpm.pp +++ b/manifests/mpm.pp @@ -13,10 +13,7 @@ $_path = "${lib_path}/${_lib}" $_id = "mpm_${mpm}_module" - if versioncmp($apache_version, '2.4') >= 0 and - (($::osfamily != 'FreeBSD') or - ($::osfamily == 'FreeBSD' and $mpm == 'itk')) { - + if versioncmp($apache_version, '2.4') >= 0 { file { "${mod_dir}/${mpm}.load": ensure => file, path => "${mod_dir}/${mpm}.load", diff --git a/manifests/params.pp b/manifests/params.pp index add2d94ae..a2ec04fd7 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -309,8 +309,8 @@ $ssl_certs_dir = '/usr/local/etc/apache24' $passenger_conf_file = 'passenger.conf' $passenger_conf_package_file = undef - $passenger_root = '/usr/local/lib/ruby/gems/1.9/gems/passenger-4.0.10' - $passenger_ruby = '/usr/bin/ruby' + $passenger_root = '/usr/local/lib/ruby/gems/2.0/gems/passenger-4.0.58' + $passenger_ruby = '/usr/local/bin/ruby' $passenger_default_ruby = undef $suphp_addhandler = 'php5-script' $suphp_engine = 'off'