opendev/puppet-httpd
Code Issues Proposed changes

Parameterize the php mod package name

Browse Source 
Change-Id: If61473b394605fa2599f53716792dd5568ad24c5
This commit is contained in:
Colleen Murphy 2017-06-11 19:52:58 +02:00
parent d4f6905da6
commit 17543eceaf
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/params.pp
View File

@ -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'

2
spec/acceptance/basic_spec.rb
View File

@ -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'),
]