Skip to content

Drop Ubuntu 10.04 compatibility code #2129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
1 change: 0 additions & 1 deletion REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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``

Expand Down
3 changes: 0 additions & 3 deletions manifests/mod/ssl.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 0 additions & 5 deletions readmes/README_ja_JP.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down Expand Up @@ -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`][]クラスは、リポジトリに適合するパッケージがないため、テストされていません。

Expand Down