Skip to content

Drop support and compatibility for Debian < 9 and Ubuntu < 16.04 #2123

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.

Sign up for GitHub

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 5 commits into from
Sep 20, 2021
Merged

Drop support and compatibility for Debian < 9 and Ubuntu < 16.04 #2123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae76cb5
Drop comments describing old Debian/Ubuntu
ekohl Sep 16, 2021
94180f4
Better nesting in spec tests
ekohl Sep 16, 2021
fd75b58
Drop redundant test
ekohl Sep 16, 2021
fbba7bb
Switch default Debian tests from 8 to 11
ekohl Sep 16, 2021
33ae7b5
Drop Debian < 9 and Ubuntu < 16.04
ekohl Sep 1, 2021
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
2 changes: 1 addition & 1 deletion manifests/dev.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# The libraries installed depends on the `dev_packages` parameter of the `apache::params`
# class, based on your operating system:
# - **Debian** : `libaprutil1-dev`, `libapr1-dev`; `apache2-dev` on Ubuntu 13.10 and Debian 8; `apache2-prefork-dev` on other versions.
# - **Debian** : `libaprutil1-dev`, `libapr1-dev`; `apache2-dev`
# - **FreeBSD**: `undef`; on FreeBSD, you must declare the `apache::package` or `apache` classes before declaring `apache::dev`.
# - **Gentoo**: `undef`.
# - **Red Hat**: `httpd-devel`.
Expand Down
3 changes: 1 addition & 2 deletions manifests/mod/suphp.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
#
class apache::mod::suphp (
) {
if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '15.10') >= 0) or
$facts['os']['name'] == 'Debian' {
if $facts['os']['family'] == 'Debian' {
fail("suphp was declared EOL by it's creators as of 2013 and so is no longer supported on Ubuntu 15.10/Debian 8 and above. Please use php-fpm")
}
include apache
Expand Down
33 changes: 1 addition & 32 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,38 +361,7 @@
$suphp_addhandler = 'x-httpd-php'
$suphp_engine = 'off'
$suphp_configpath = '/etc/php5/apache2'
if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') < 0) {
# Only the major version is used here
$php_version = '5'
$mod_packages = {
'auth_cas' => 'libapache2-mod-auth-cas',
'auth_kerb' => 'libapache2-mod-auth-kerb',
'auth_openidc' => 'libapache2-mod-auth-openidc',
'auth_gssapi' => 'libapache2-mod-auth-gssapi',
'auth_mellon' => 'libapache2-mod-auth-mellon',
'authnz_pam' => 'libapache2-mod-authnz-pam',
'dav_svn' => 'libapache2-svn',
'fastcgi' => 'libapache2-mod-fastcgi',
'fcgid' => 'libapache2-mod-fcgid',
'geoip' => 'libapache2-mod-geoip',
'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
'jk' => 'libapache2-mod-jk',
'lookup_identity' => 'libapache2-mod-lookup-identity',
'nss' => 'libapache2-mod-nss',
'pagespeed' => 'mod-pagespeed-stable',
'passenger' => 'libapache2-mod-passenger',
'perl' => 'libapache2-mod-perl2',
'phpXXX' => 'libapache2-mod-phpXXX',
'proxy_html' => 'libapache2-mod-proxy-html',
'python' => 'libapache2-mod-python',
'rpaf' => 'libapache2-mod-rpaf',
'security' => 'libapache2-modsecurity',
'shib2' => 'libapache2-mod-shib2',
'suphp' => 'libapache2-mod-suphp',
'wsgi' => 'libapache2-mod-wsgi',
'xsendfile' => 'libapache2-mod-xsendfile',
}
} elsif ($::operatingsystem == 'Ubuntu') or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemmajrelease, '11') < 0) {
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
Expand Down
2 changes: 0 additions & 2 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"8",
"9",
"10",
"11"
Expand All @@ -67,7 +66,6 @@
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"14.04",
"16.04",
"18.04",
"20.04"
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/apache_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

describe 'apache', type: :class do
context 'on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::params') }
it {
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/alias_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

context 'default configuration with parameters' do
context 'on a Debian OS', :compile do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_apache__mod('alias') }
it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"}) }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/auth_cas_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
end

context 'on a Debian OS', :compile do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::params') }
it { is_expected.to contain_apache__mod('auth_cas') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/auth_gssapi_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

context 'default configuration with parameters' do
context 'on a Debian OS', :compile do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::params') }
it { is_expected.to contain_apache__mod('auth_gssapi') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/auth_kerb_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

context 'default configuration with parameters' do
context 'on a Debian OS', :compile do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::params') }
it { is_expected.to contain_apache__mod('auth_kerb') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/auth_mellon_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
it_behaves_like 'a mod class, without including apache'

context 'default configuration with parameters on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

describe 'with no parameters' do
it { is_expected.to contain_apache__mod('auth_mellon') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/auth_openidc_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

context 'default configuration with parameters' do
context 'on a Debian OS', :compile do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::params') }
it { is_expected.to contain_apache__mod('auth_openidc') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/authn_dbd_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
end

context 'on a Debian OS', :compile do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::params') }
it { is_expected.to contain_apache__mod('authn_dbd') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/authnz_ldap_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
it_behaves_like 'a mod class, without including apache'

context 'default configuration with parameters on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::params') }
it { is_expected.to contain_class('apache::mod::ldap') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/authnz_pam_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

context 'default configuration with parameters' do
context 'on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache') }
it { is_expected.to contain_package('libapache2-mod-authnz-pam') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/data_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

describe 'apache::mod::data', type: :class do
context 'on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'
let :params do
{ apache_version: '2.4' }
end
Expand Down
6 changes: 3 additions & 3 deletions spec/classes/mod/dav_svn_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

context 'default configuration with parameters' do
context 'on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::params') }
it { is_expected.to contain_apache__mod('dav_svn') }
it { is_expected.to contain_package('libapache2-svn') }
it { is_expected.to contain_package('libapache2-mod-svn') }
it { is_expected.to contain_file('dav_svn.load').with_content(%r{LoadModule dav_svn_module}) }
describe 'with parameters' do
let :params do
Expand All @@ -22,7 +22,7 @@

it { is_expected.to contain_class('apache::params') }
it { is_expected.to contain_apache__mod('dav_svn') }
it { is_expected.to contain_package('libapache2-svn') }
it { is_expected.to contain_package('libapache2-mod-svn') }
it { is_expected.to contain_apache__mod('authz_svn') }
it { is_expected.to contain_file('dav_svn_authz_svn.load').with_content(%r{LoadModule authz_svn_module}) }
end
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/deflate_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def general_deflate_specs
end

context 'On a Debian OS with default params' do
include_examples 'Debian 8'
include_examples 'Debian 11'

# Load the more generic tests for this context
general_deflate_specs
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/dev_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

it_behaves_like 'a mod class, without including apache'

['RedHat 6', 'Debian 8', 'FreeBSD 9'].each do |os|
['RedHat 6', 'Debian 11', 'FreeBSD 9'].each do |os|
context "on a #{os} OS" do
include_examples os

Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/dir_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require 'spec_helper'

describe 'apache::mod::dir', type: :class do
['Debian 8', 'RedHat 6', 'FreeBSD 9', 'Gentoo'].each do |os|
['Debian 11', 'RedHat 6', 'FreeBSD 9', 'Gentoo'].each do |os|
context "default configuration with parameters on #{os}" do
include_examples os

Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/disk_cache_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

describe 'apache::mod::disk_cache', type: :class do
context 'on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

let(:params) do
{
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/dumpio_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}'
end

include_examples 'Debian 8'
include_examples 'Debian 11'

context 'default configuration fore parameters' do
it { is_expected.to compile }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/event_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
it { is_expected.to contain_file('/etc/apache2/modules.d/event.conf').with_ensure('file') }
end
context 'on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::params') }
it { is_expected.not_to contain_apache__mod('event') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/expires_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
it_behaves_like 'a mod class, without including apache'

context 'with expires active', :compile do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_apache__mod('expires') }
it { is_expected.to contain_file('expires.conf').with(content: %r{ExpiresActive On\n}) }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/ext_filter_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
describe 'apache::mod::ext_filter', type: :class do
it_behaves_like 'a mod class, without including apache'
context 'on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

describe 'with no parameters' do
it { is_expected.to contain_apache__mod('ext_filter') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/fcgid_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
it_behaves_like 'a mod class, without including apache'

context 'on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::params') }
it {
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/http2_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
it_behaves_like 'a mod class, without including apache'

context 'default configuration with parameters on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::mod::http2') }
context 'with default values' do
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/info_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def general_info_specs_apache24
it_behaves_like 'a mod class, without including apache'

context 'On a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

# Load the more generic tests for this context
general_info_specs_apache24
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/intercept_form_submit_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

context 'default configuration with parameters' do
context 'on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache') }
it { is_expected.to contain_package('libapache2-mod-intercept-form-submit') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/itk_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
end

context 'on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::params') }
it { is_expected.not_to contain_apache__mod('itk') }
Expand Down
4 changes: 2 additions & 2 deletions spec/classes/mod/jk_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
default_port = 80
altern8_port = 8008

context 'Debian 8' do
include_examples 'Debian 8'
context 'Debian 11' do
include_examples 'Debian 11'

context 'with only required facts and default parameters' do
let(:facts) { super().merge('ipaddress' => default_ip) }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/ldap_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
it_behaves_like 'a mod class, without including apache'

context 'on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::params') }
it { is_expected.to contain_class('apache::mod::ldap') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/lookup_identity.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

context 'default configuration with parameters' do
context 'on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache') }
it { is_expected.to contain_package('libapache2-mod-lookup-identity') }
Expand Down
16 changes: 1 addition & 15 deletions spec/classes/mod/mime_magic_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def general_mime_magic_specs
it_behaves_like 'a mod class, without including apache'

context 'On a Debian OS with default params' do
include_examples 'Debian 8'
include_examples 'Debian 11'

general_mime_magic_specs

Expand Down Expand Up @@ -56,18 +56,4 @@ def general_mime_magic_specs

it { is_expected.to contain_file('mime_magic.conf').with_path('/etc/httpd/conf.d/mime_magic.conf') }
end

context 'with magic_file => /tmp/magic' do
include_examples 'Debian 8'

let :params do
{ magic_file: '/tmp/magic' }
end

it do
is_expected.to contain_file('mime_magic.conf').with_content(
"MIMEMagicFile \"/tmp/magic\"\n",
)
end
end
end
2 changes: 1 addition & 1 deletion spec/classes/mod/mime_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def general_mime_specs
it_behaves_like 'a mod class, without including apache'

context 'On a Debian OS with default params', :compile do
include_examples 'Debian 8'
include_examples 'Debian 11'

general_mime_specs

Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/negotiation_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
describe 'apache::mod::negotiation', type: :class do
it_behaves_like 'a mod class, without including apache'
describe 'OS independent tests' do
include_examples 'Debian 8'
include_examples 'Debian 11'

context 'default params' do
it { is_expected.to contain_class('apache') }
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/pagespeed_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

describe 'apache::mod::pagespeed', type: :class do
context 'on a Debian OS' do
include_examples 'Debian 8'
include_examples 'Debian 11'

it { is_expected.to contain_class('apache::params') }
it { is_expected.to contain_apache__mod('pagespeed') }
Expand Down
Loading