diff --git a/manifests/module.pp b/manifests/module.pp index 9e90b6e..c2e9693 100644 --- a/manifests/module.pp +++ b/manifests/module.pp @@ -25,8 +25,25 @@ } } - package { $package: - ensure => $ensure, + if $title == 'opcache' { + package { 'php5-opcache': + name => 'php5', + } + } else { + package { $package: + ensure => $ensure, + } } + + # Enable module in Ubuntu 14.04 LTS + if $lsbdistcodename == 'trusty' { + exec { "enable $title": + unless => "php5query -s apache2 -m $title", + command => "php5enmod $title", + path => ['/bin', '/usr/bin', '/usr/sbin'], + require => Package[$package], + } + } + } diff --git a/manifests/params.pp b/manifests/params.pp index ff07341..c7b867a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -5,7 +5,10 @@ $php_apc_package_name = 'php-apc' $common_package_name = 'php5-common' $cli_package_name = 'php5-cli' - $php_conf_dir = '/etc/php5/conf.d' + $php_conf_dir = $lsbdistcodename ? { + 'trusty' => '/etc/php5/apache2/conf.d', + default => '/etc/php5/conf.d', + } $fpm_package_name = 'php5-fpm' $fpm_service_name = 'php5-fpm' $fpm_pool_dir = '/etc/php5/fpm/pool.d'