Remove conditionals for releases older than Mageia 6

This eliminates a bunch of conditionals, simplifying the configuration.
We no longer have any servers running on a release older than this.

3 files changed, 4 insertions, 21 deletions

diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp
index 9190867a..4e1d6ed4 100644
--- a/modules/apache/manifests/base.pp
+++ b/modules/apache/manifests/base.pp
@@ -1,25 +1,12 @@
 class apache::base {
     include apache::var
 
-    # apache-mpm-prefork is merged from mga3 up
-    $apache_server = $lsbdistrelease ? {
-        /1|2/   => 'apache-mpm-prefork',
-        default => 'apache',
-    }
+    $conf_d = '/etc/httpd/conf/conf.d'
 
-    package { $apache_server:
+    package { 'apache':
         alias => 'apache-server',
     }
 
-    if versioncmp($::lsbdistrelease, '2') <= 0 {
-        $conf_d = '/etc/httpd/conf.d'
-
-        # only needed on mga1 and mga2
-        package { $apache::var::pkg_conf: }
-    } else {
-        $conf_d = '/etc/httpd/conf/conf.d'
-    }
-
     service { 'httpd':
         alias     => 'apache',
         subscribe => [ Package['apache-server'] ],
diff --git a/modules/apache/manifests/var.pp b/modules/apache/manifests/var.pp
index 2c33a23f..4a6d68eb 100644
--- a/modules/apache/manifests/var.pp
+++ b/modules/apache/manifests/var.pp
@@ -8,9 +8,5 @@ class apache::var(
     $apache_group = 'apache',
     $default_vhost_redirect = ''
 ) {
-    if ($::lsbdistrelease == '1') or ($::lsbdistid == 'MandrivaLinux') {
-        $pkg_conf = 'apache-conf'
-    } else {
-        $pkg_conf = 'apache'
-    }
+    $pkg_conf = 'apache'
 }
diff --git a/modules/apache/templates/50_mod_deflate.conf b/modules/apache/templates/50_mod_deflate.conf
index 09edf006..5192bf6e 100644
--- a/modules/apache/templates/50_mod_deflate.conf
+++ b/modules/apache/templates/50_mod_deflate.conf
@@ -1,5 +1,5 @@
 <IfModule mod_deflate.c>
-  # Compress HTML, CSS, JavaScript, Text, XML and fonts
+  # Compress HTML, CSS, JavaScript, JSON, Text, XML and fonts
   AddOutputFilterByType DEFLATE application/javascript
   AddOutputFilterByType DEFLATE application/json
   AddOutputFilterByType DEFLATE application/rss+xml