Skip to content

Commit 2152f74

Browse files
ekohlCiaran McCrisken
authored andcommitted
Correct Ubuntu 16.04 packages
This corrects some module packages for Ubuntu 16.04. suphp was actually removed. The other packages are transitional packages. Using the modern ones aligns them with newer versions. It also greatly simplifies the params code.
1 parent 5f883be commit 2152f74

File tree

1 file changed

+2
-31
lines changed

1 file changed

+2
-31
lines changed

manifests/params.pp

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,10 @@
389389
'wsgi' => 'libapache2-mod-wsgi',
390390
'xsendfile' => 'libapache2-mod-xsendfile',
391391
}
392-
} elsif ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
392+
} else {
393393
$php_version = $facts['operatingsystemmajrelease'] ? {
394394
'9' => '7.0', # Debian Stretch
395+
'16.04' => '7.0', # Ubuntu Xenial
395396
'10' => '7.3', # Debian Buster
396397
'20.04' => '7.4', # Ubuntu Foccal Fossal
397398
default => '7.2', # Ubuntu Bionic, Cosmic and Disco
@@ -423,36 +424,6 @@
423424
'wsgi' => 'libapache2-mod-wsgi',
424425
'xsendfile' => 'libapache2-mod-xsendfile',
425426
}
426-
} else {
427-
# Ubuntu Xenial
428-
$php_version = '7.0'
429-
$mod_packages = {
430-
'auth_cas' => 'libapache2-mod-auth-cas',
431-
'auth_kerb' => 'libapache2-mod-auth-kerb',
432-
'auth_openidc' => 'libapache2-mod-auth-openidc',
433-
'auth_gssapi' => 'libapache2-mod-auth-gssapi',
434-
'auth_mellon' => 'libapache2-mod-auth-mellon',
435-
'authnz_pam' => 'libapache2-mod-authnz-pam',
436-
'dav_svn' => 'libapache2-svn',
437-
'fastcgi' => 'libapache2-mod-fastcgi',
438-
'fcgid' => 'libapache2-mod-fcgid',
439-
'geoip' => 'libapache2-mod-geoip',
440-
'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
441-
'jk' => 'libapache2-mod-jk',
442-
'lookup_identity' => 'libapache2-mod-lookup-identity',
443-
'nss' => 'libapache2-mod-nss',
444-
'pagespeed' => 'mod-pagespeed-stable',
445-
'passenger' => 'libapache2-mod-passenger',
446-
'perl' => 'libapache2-mod-perl2',
447-
'phpXXX' => 'libapache2-mod-phpXXX',
448-
'python' => 'libapache2-mod-python',
449-
'rpaf' => 'libapache2-mod-rpaf',
450-
'security' => 'libapache2-modsecurity',
451-
'shib2' => 'libapache2-mod-shib2',
452-
'suphp' => 'libapache2-mod-suphp',
453-
'wsgi' => 'libapache2-mod-wsgi',
454-
'xsendfile' => 'libapache2-mod-xsendfile',
455-
}
456427
}
457428
$error_log = 'error.log'
458429
$scriptalias = '/usr/lib/cgi-bin'

0 commit comments

Comments
 (0)