Skip to content

Commit ce0c38d

Browse files
committed
Drop Ubuntu 10.04 compatibility code
This is long End of Life and should not be supported.
1 parent 7057d3e commit ce0c38d

File tree

5 files changed

+1
-14
lines changed

5 files changed

+1
-14
lines changed

README.md

-4
Original file line numberDiff line numberDiff line change
@@ -908,10 +908,6 @@ See [here](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linu
908908

909909
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.
910910

911-
### Ubuntu 10.04
912-
913-
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.
914-
915911
### Ubuntu 16.04
916912
The [`apache::mod::suphp`][] class is untested since repositories are missing compatible packages.
917913

REFERENCE.md

-1
Original file line numberDiff line numberDiff line change
@@ -6492,7 +6492,6 @@ Default based on the OS and/or Apache version:
64926492
- RedHat/FreeBSD/Suse/Gentoo: 'default'.
64936493
- Debian/Ubuntu + Apache >= 2.4: 'default'.
64946494
- Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
6495-
- Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
64966495

64976496
Default value: ``undef``
64986497

manifests/mod/ssl.pp

-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
# - RedHat/FreeBSD/Suse/Gentoo: 'default'.
6262
# - Debian/Ubuntu + Apache >= 2.4: 'default'.
6363
# - Debian/Ubuntu + Apache < 2.4: 'file:${APACHE_RUN_DIR}/ssl_mutex'.
64-
# - Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
6564
#
6665
# @param apache_version
6766
# Used to verify that the Apache version you have requested is compatible with the module.
@@ -111,8 +110,6 @@
111110
'debian': {
112111
if versioncmp($_apache_version, '2.4') >= 0 {
113112
$_ssl_mutex = 'default'
114-
} elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' {
115-
$_ssl_mutex = 'file:/var/run/apache2/ssl_mutex'
116113
} else {
117114
$_ssl_mutex = "file:\${APACHE_RUN_DIR}/ssl_mutex"
118115
}

manifests/params.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@
781781
fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
782782
}
783783

784-
if ($::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04') or ($::operatingsystem == 'SLES') {
784+
if $::operatingsystem == 'SLES' {
785785
$verify_command = '/usr/sbin/apache2ctl -t'
786786
} elsif $::operatingsystem == 'FreeBSD' {
787787
$verify_command = '/usr/local/sbin/apachectl -t'

readmes/README_ja_JP.md

-5
Original file line numberDiff line numberDiff line change
@@ -2851,7 +2851,6 @@ Apacheモジュール`mod_rewrite`をインストールして有効にします
28512851
* RedHat/FreeBSD/Suse/Gentoo: 'default'.
28522852
* Debian/Ubuntu + Apache >= 2.4: 'default'.
28532853
* Debian/Ubuntu + Apache < 2.4: 'file:\${APACHE_RUN_DIR}/ssl_mutex'.
2854-
* Ubuntu 10.04: 'file:/var/run/apache2/ssl_mutex'.
28552854

28562855

28572856
##### クラス: `apache::mod::status`
@@ -5734,10 +5733,6 @@ apache::vhost { 'test.server':
57345733

57355734
`chcon`ではなく、`semanage fcontext`を用いてコンテキストを設定する必要があります。これは、Puppetの`file`リソースでは、リソースにより指定されていない場合、その値のコンテキストがリセットされるためです。
57365735

5737-
### Ubuntu 10.04
5738-
5739-
[`apache::vhost::WSGIImportScript`][]パラメータにより、Apacheの古いバージョンではサポートされていないバーチャルホスト内のステートメントが作成され、不具合が生じます。これは今後のリファクタリングで修正される予定です。
5740-
57415736
### Ubuntu 16.04
57425737
[`apache::mod::suphp`][]クラスは、リポジトリに適合するパッケージがないため、テストされていません。
57435738

0 commit comments

Comments
 (0)