diff --git a/manifests/params.pp b/manifests/params.pp index 5297046..b13ab83 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -43,7 +43,10 @@ class httpd::params { } 'ubuntu', 'debian': { $apache_name = 'apache2' - $php_package = 'libapache2-mod-php5' + $php_package = $::lsbdistcodename ? { + 'xenial' => 'libapache2-mod-php7.0', + default => 'libapache2-mod-php5' + } $mod_python_package = 'libapache2-mod-python' $mod_wsgi_package = 'libapache2-mod-wsgi' $ssl_package = 'apache-ssl' diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb index 12d55ae..bcc6991 100644 --- a/spec/acceptance/basic_spec.rb +++ b/spec/acceptance/basic_spec.rb @@ -86,7 +86,7 @@ describe 'puppet-httpd module' do package('apache2-dev'), package('libaprutil1-dev'), package('libapr1-dev'), - package('libapache2-mod-php5'), + package('libapache2-mod-php7.0'), package('libapache2-mod-python'), ]