Drop Debian < 9 and Ubuntu < 16.04

Author: ekohl

manifests/mod/suphp.pp

@@ -5,8 +5,7 @@
 #
 class apache::mod::suphp (
 ) {
-  if  ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '15.10') >= 0) or
-  $facts['os']['name'] == 'Debian' {
+  if $facts['os']['family'] == 'Debian' {
     fail("suphp was declared EOL by it's creators as of 2013 and so is no longer supported on Ubuntu 15.10/Debian 8 and above. Please use php-fpm")
   }
   include apache

manifests/params.pp

@@ -361,38 +361,7 @@
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
-    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') < 0) {
-      # Only the major version is used here
-      $php_version = '5'
-      $mod_packages = {
-        'auth_cas'              => 'libapache2-mod-auth-cas',
-        'auth_kerb'             => 'libapache2-mod-auth-kerb',
-        'auth_openidc'          => 'libapache2-mod-auth-openidc',
-        'auth_gssapi'           => 'libapache2-mod-auth-gssapi',
-        'auth_mellon'           => 'libapache2-mod-auth-mellon',
-        'authnz_pam'            => 'libapache2-mod-authnz-pam',
-        'dav_svn'               => 'libapache2-svn',
-        'fastcgi'               => 'libapache2-mod-fastcgi',
-        'fcgid'                 => 'libapache2-mod-fcgid',
-        'geoip'                 => 'libapache2-mod-geoip',
-        'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
-        'jk'                    => 'libapache2-mod-jk',
-        'lookup_identity'       => 'libapache2-mod-lookup-identity',
-        'nss'                   => 'libapache2-mod-nss',
-        'pagespeed'             => 'mod-pagespeed-stable',
-        'passenger'             => 'libapache2-mod-passenger',
-        'perl'                  => 'libapache2-mod-perl2',
-        'phpXXX'                => 'libapache2-mod-phpXXX',
-        'proxy_html'            => 'libapache2-mod-proxy-html',
-        'python'                => 'libapache2-mod-python',
-        'rpaf'                  => 'libapache2-mod-rpaf',
-        'security'              => 'libapache2-modsecurity',
-        'shib2'                 => 'libapache2-mod-shib2',
-        'suphp'                 => 'libapache2-mod-suphp',
-        'wsgi'                  => 'libapache2-mod-wsgi',
-        'xsendfile'             => 'libapache2-mod-xsendfile',
-      }
-    } elsif ($::operatingsystem == 'Ubuntu') or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemmajrelease, '11') < 0) {
+    if ($::operatingsystem == 'Ubuntu') or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemmajrelease, '11') < 0) {
       $php_version = $facts['operatingsystemmajrelease'] ? {
         '9'     => '7.0', # Debian Stretch
         '16.04' => '7.0', # Ubuntu Xenial

metadata.json

@@ -51,7 +51,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "8",
         "9",
         "10",
         "11"
@@ -67,7 +66,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04",
         "16.04",
         "18.04",
         "20.04"

spec/classes/mod/php_spec.rb

@@ -20,29 +20,6 @@
             it { is_expected.to contain_class('apache::mod::prefork') }
           end
           case facts[:os]['release']['major']
-          when '8'
-            context 'on jessie' do
-              it {
-                is_expected.to contain_file('php5.load').with(
-                  content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
-                )
-              }
-              context 'with mpm_module => itk on jessie' do
-                let :pre_condition do
-                  'class { "apache": mpm_module => itk, }'
-                end
-
-                it { is_expected.to contain_class('apache::params') }
-                it { is_expected.to contain_class('apache::mod::itk') }
-                it { is_expected.to contain_apache__mod('php5') }
-                it { is_expected.to contain_package('libapache2-mod-php5') }
-                it {
-                  is_expected.to contain_file('php5.load').with(
-                    content: "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n",
-                  )
-                }
-              end
-            end
           when '9'
             context 'on stretch' do
               it { is_expected.to contain_apache__mod('php7.0') }