Drop Ubuntu < 18.04

Author: ekohl

manifests/mpm.pp

@@ -84,31 +84,28 @@
         }
       }
 
-      if $mpm == 'itk' {
-        include apache::mpm::disable_mpm_event
-        include apache::mpm::disable_mpm_worker
+      case $mpm {
+        'itk': {
+          include apache::mpm::disable_mpm_event
+          include apache::mpm::disable_mpm_worker
 
-        package { 'libapache2-mpm-itk':
-          ensure => present,
-          before => [
-            Class['apache::service'],
-            File[$apache::mod_enable_dir],
-          ],
+          package { 'libapache2-mpm-itk':
+            ensure => present,
+            before => [
+              Class['apache::service'],
+              File[$apache::mod_enable_dir],
+            ],
+          }
         }
-      }
-
-      if $mpm == 'prefork' {
-        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or $::operatingsystem == 'Debian' ) {
+        'prefork': {
           include apache::mpm::disable_mpm_event
           include apache::mpm::disable_mpm_worker
         }
-      }
-
-      if $mpm == 'worker' {
-        if ( ( $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'18.04') >= 0 ) or $::operatingsystem == 'Debian' ) {
+        'worker': {
           include apache::mpm::disable_mpm_event
           include apache::mpm::disable_mpm_prefork
         }
+        default: {}
       }
     }
 

manifests/params.pp

@@ -364,7 +364,6 @@
     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
         '10'    => '7.3', # Debian Buster
         '20.04' => '7.4', # Ubuntu Foccal Fossal
         default => '7.2', # Ubuntu Bionic, Cosmic and Disco
@@ -460,7 +459,7 @@
     $secpcrematchlimit = 1500
     $secpcrematchlimitrecursion = 1500
     $modsec_secruleengine = 'On'
-    if ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
+    if $facts['operatingsystem'] == 'Debian' or ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') >= 0) {
       $modsec_default_rules = [
         'crawlers-user-agents.data',
         'iis-errors.data',

metadata.json

@@ -66,7 +66,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "16.04",
         "18.04",
         "20.04"
       ]

spec/classes/mod/php_spec.rb

@@ -78,19 +78,6 @@
                 }
               end
             end
-          when '16.04'
-            context 'on xenial' do
-              let :params do
-                { content: 'somecontent' }
-              end
-
-              it {
-                is_expected.to contain_file('php7.0.conf').with(
-                  content: 'somecontent',
-                )
-              }
-            end
-
           when '18.04'
             context 'on bionic' do
               let :params do
@@ -231,12 +218,7 @@
       end
 
       # all the following tests are for legacy php/apache versions. They don't work on modern ubuntu and redhat 8
-      next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
-              (facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES')  ||
-              (facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian') ||
-              (facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS'))
-
-      describe 'OS independent tests' do
+      describe 'OS independent tests', if: (facts[:os]['family'] == 'Redhat' && facts[:os]['release']['major'].to_i < 8) do
         context 'with content param' do
           let :params do
             { content: 'somecontent' }

spec/spec_helper_acceptance_local.rb

@@ -49,7 +49,7 @@ def print_parsing_errors
       }
     }
     # needed for ss, for serverspec checks
-    if $::operatingsystem == 'Ubuntu' and $::operatingsystemmajrelease !~ /14.04|16.04/ {
+    if $::operatingsystem == 'Ubuntu' {
       package { 'iproute2':
         ensure   => 'latest',
       }