Browse Source

Parameterize the php mod package name

Change-Id: If61473b394605fa2599f53716792dd5568ad24c5
changes/17/473117/1
Colleen Murphy 1 year ago
parent
commit
17543eceaf
2 changed files with 5 additions and 2 deletions
  1. 4
    1
      manifests/params.pp
  2. 1
    1
      spec/acceptance/basic_spec.rb

+ 4
- 1
manifests/params.pp View File

@@ -43,7 +43,10 @@ class httpd::params {
43 43
     }
44 44
     'ubuntu', 'debian': {
45 45
       $apache_name = 'apache2'
46
-      $php_package = 'libapache2-mod-php5'
46
+      $php_package = $::lsbdistcodename ? {
47
+        'xenial' => 'libapache2-mod-php7.0',
48
+        default => 'libapache2-mod-php5'
49
+      }
47 50
       $mod_python_package = 'libapache2-mod-python'
48 51
       $mod_wsgi_package = 'libapache2-mod-wsgi'
49 52
       $ssl_package = 'apache-ssl'

+ 1
- 1
spec/acceptance/basic_spec.rb View File

@@ -86,7 +86,7 @@ describe 'puppet-httpd module' do
86 86
         package('apache2-dev'),
87 87
         package('libaprutil1-dev'),
88 88
         package('libapr1-dev'),
89
-        package('libapache2-mod-php5'),
89
+        package('libapache2-mod-php7.0'),
90 90
         package('libapache2-mod-python'),
91 91
       ]
92 92
 

Loading…
Cancel
Save