From ce0c38dcac722aa66a206ce5f23f01839fbfe340 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 27 Dec 2020 14:19:12 +0100
Subject: [PATCH] Drop Ubuntu 10.04 compatibility code

This is long End of Life and should not be supported.
---
 README.md               | 4 ----
 REFERENCE.md            | 1 -
 manifests/mod/ssl.pp    | 3 ---
 manifests/params.pp     | 2 +-
 readmes/README_ja_JP.md | 5 -----
 5 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/README.md b/README.md
index fc0c66b665..481cda31b8 100755
--- a/README.md
+++ b/README.md
@@ -908,10 +908,6 @@ See [here](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linu
 
 You must set the contexts using `semanage fcontext` instead of `chcon` because Puppet's `file` resources reset the values' context in the database if the resource doesn't specify it.
 
-### Ubuntu 10.04
-
-The [`apache::vhost::WSGIImportScript`][] parameter creates a statement inside the virtual host that is unsupported on older versions of Apache, causing it to fail. This will be remedied in a future refactoring.
-
 ### Ubuntu 16.04
 The [`apache::mod::suphp`][] class is untested since repositories are missing compatible packages.
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 1962888b47..8543c9854a 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -6492,7 +6492,6 @@ Default based on the OS and/or Apache version:
 - RedHat/FreeBSD/Suse/Gentoo: 'default'.
 - Debian/Ubuntu + Apache >= 2.4: 'default'.
 - Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
-- Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
 
 Default value: ``undef``
 
diff --git a/manifests/mod/ssl.pp b/manifests/mod/ssl.pp
index 1d4026a59a..28ac3d0439 100644
--- a/manifests/mod/ssl.pp
+++ b/manifests/mod/ssl.pp
@@ -61,7 +61,6 @@
 #   - RedHat/FreeBSD/Suse/Gentoo: 'default'.
 #   - Debian/Ubuntu + Apache >= 2.4: 'default'.
 #   - Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
-#   - Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
 #
 # @param apache_version
 #   Used to verify that the Apache version you have requested is compatible with the module.
@@ -111,8 +110,6 @@
       'debian': {
         if versioncmp($_apache_version, '2.4') >= 0 {
           $_ssl_mutex = 'default'
-        } elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' {
-          $_ssl_mutex = 'file:/var/run/apache2/ssl_mutex'
         } else {
           $_ssl_mutex = "file:\${APACHE_RUN_DIR}/ssl_mutex"
         }
diff --git a/manifests/params.pp b/manifests/params.pp
index 0576ec0dc4..da6fd9f217 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -781,7 +781,7 @@
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }
 
-  if ($::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04') or ($::operatingsystem == 'SLES') {
+  if $::operatingsystem == 'SLES' {
     $verify_command = '/usr/sbin/apache2ctl -t'
   } elsif $::operatingsystem == 'FreeBSD' {
     $verify_command = '/usr/local/sbin/apachectl -t'
diff --git a/readmes/README_ja_JP.md b/readmes/README_ja_JP.md
index 2e9a564892..22fbebcc14 100644
--- a/readmes/README_ja_JP.md
+++ b/readmes/README_ja_JP.md
@@ -2851,7 +2851,6 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
   * RedHat/FreeBSD/Suse/Gentoo: 'default'.
   * Debian/Ubuntu + Apache >= 2.4: 'default'.
   * Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'.
-  * Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
 
 
 ##### クラス: `apache::mod::status`
@@ -5734,10 +5733,6 @@ apache::vhost { 'test.server':
 
 `chcon`ではなく、`semanage fcontext`を用いてコンテキストを設定する必要があります。これは、Puppetの`file`リソースでは、リソースにより指定されていない場合、その値のコンテキストがリセットされるためです。
 
-### Ubuntu 10.04
-
-[`apache::vhost::WSGIImportScript`][]パラメータにより、Apacheの古いバージョンではサポートされていないバーチャルホスト内のステートメントが作成され、不具合が生じます。これは今後のリファクタリングで修正される予定です。
-
 ### Ubuntu 16.04
 [`apache::mod::suphp`][]クラスは、リポジトリに適合するパッケージがないため、テストされていません。