Skip to content

Commit c9776cf

Browse files
bastelfreakbastelfreak
committed
Drop EoL Debian 9 and older code
Debian 9 was already removed from metadata.json and isn't supported anymore. This PR drops some code leftovers.
1 parent 9c73e67 commit c9776cf

File tree

8 files changed

+19
-31
lines changed

8 files changed

+19
-31
lines changed

‎REFERENCE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ Default value: `$apache::params::icons_prefix`
12141214

12151215
Installs `mod_apreq2`.
12161216

1217-
* **Note** Unsupported platforms: CentOS: all; Debian: 8; OracleLinux: all; RedHat: all; Scientific: all; SLES: all; Ubuntu: all
1217+
* **Note** Unsupported platforms: CentOS: all; OracleLinux: all; RedHat: all; Scientific: all; SLES: all; Ubuntu: all
12181218

12191219
* **See also**
12201220
* http://httpd.apache.org/apreq/docs/libapreq2/group__mod__apreq2.html
@@ -3602,7 +3602,7 @@ Installs `mod_macro`.
36023602

36033603
Installs and configures `mod_md`.
36043604

3605-
* **Note** Unsupported platforms: CentOS: 6, 7; Debian: 8, 9; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
3605+
* **Note** Unsupported platforms: CentOS: 6, 7; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
36063606

36073607
* **See also**
36083608
* https://httpd.apache.org/docs/current/mod/mod_md.html

‎manifests/mod/apreq2.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# @see http://httpd.apache.org/apreq/docs/libapreq2/group__mod__apreq2.html for additional documentation.
55
#
6-
# @note Unsupported platforms: CentOS: all; Debian: 8; OracleLinux: all; RedHat: all; Scientific: all; SLES: all; Ubuntu: all
6+
# @note Unsupported platforms: CentOS: all; OracleLinux: all; RedHat: all; Scientific: all; SLES: all; Ubuntu: all
77
class apache::mod::apreq2 {
88
::apache::mod { 'apreq2':
99
id => 'apreq_module',

‎manifests/mod/md.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#
3232
# @param md_challenge_dns01
3333
# Define a program to be called when the `dns-01` challenge needs to be
34-
# setup/torn down.
34+
# setup/torn down.
3535
#
3636
# @param md_contact_email
3737
# The ACME protocol requires you to give a contact url when you sign up.
@@ -91,7 +91,7 @@
9191
#
9292
# @see https://httpd.apache.org/docs/current/mod/mod_md.html for additional documentation.
9393
#
94-
# @note Unsupported platforms: CentOS: 6, 7; Debian: 8, 9; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
94+
# @note Unsupported platforms: CentOS: 6, 7; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
9595
class apache::mod::md (
9696
Optional[String] $md_activation_delay = undef,
9797
Optional[Apache::OnOff] $md_base_server = undef,

‎manifests/mod/shib.pp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
# @summary
22
# Installs and configures `mod_shib`.
3-
#
3+
#
44
# @param suppress_warning
55
# Toggles whether to trigger warning on RedHat nodes.
6-
#
6+
#
77
# @param mod_full_path
88
# Specifies a path to the module. Do not manually set this parameter without a special reason.
9-
#
9+
#
1010
# @param package_name
1111
# Name of the Shibboleth package to be installed.
12-
#
12+
#
1313
# @param mod_lib
14-
# Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter
15-
# overrides this value.
14+
# Specifies a path to the module's libraries. Do not manually set this parameter without special reason. The `path` parameter
15+
# overrides this value.
1616
#
1717
# This class installs and configures only the Apache components of a web application that consumes Shibboleth SSO identities. You
1818
# can manage the Shibboleth configuration manually, with Puppet, or using a [Shibboleth Puppet Module](https://github.com/aethylred/puppet-shibboleth).
19-
#
19+
#
2020
# @note
21-
# The Shibboleth module isn't available on RH/CentOS without providing dependency packages provided by Shibboleth's repositories.
21+
# The Shibboleth module isn't available on RH/CentOS without providing dependency packages provided by Shibboleth's repositories.
2222
# See the [Shibboleth Service Provider Installation Guide](http://wiki.aaf.edu.au/tech-info/sp-install-guide).
2323
#
2424
# @see https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig for additional documentation.
25-
# @note Unsupported platforms: RedHat: all; CentOS: all; Scientific: all; SLES: all; Debian: 7, 8; Ubuntu: all; OracleLinux: all
25+
# @note Unsupported platforms: RedHat: all; CentOS: all; Scientific: all; SLES: all; Ubuntu: all; OracleLinux: all
2626
class apache::mod::shib (
2727
Boolean $suppress_warning = false,
2828
Optional[Stdlib::Absolutepath] $mod_full_path = undef,

‎manifests/params.pp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@
375375
$default_ssl_key = '/etc/ssl/private/ssl-cert-snakeoil.key'
376376
$ssl_sessioncache = "\${APACHE_RUN_DIR}/ssl_scache(512000)"
377377
$php_version = $facts['os']['release']['major'] ? {
378-
'9' => '7.0', # Debian Stretch
379378
'10' => '7.3', # Debian Buster
380379
'11' => '7.4', # Debian Bullseye
381380
'12' => '8.2', # Debian Bookworm
@@ -408,14 +407,6 @@
408407
$_os_mod_packages = case $facts['os']['name'] {
409408
'Debian': {
410409
case $facts['os']['release']['major'] {
411-
'9': {
412-
{
413-
'auth_kerb' => 'libapache2-mod-auth-kerb',
414-
'nss' => 'libapache2-mod-nss',
415-
'shib2' => 'libapache2-mod-shib2',
416-
'wsgi' => 'libapache2-mod-wsgi',
417-
}
418-
}
419410
'10': {
420411
{
421412
'auth_kerb' => 'libapache2-mod-auth-kerb',
@@ -466,7 +457,7 @@
466457
$error_log = 'error.log'
467458
$scriptalias = '/usr/lib/cgi-bin'
468459
$access_log_file = 'access.log'
469-
if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '19.04') < 0) or ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '10') < 0) {
460+
if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '19.04') < 0) {
470461
$shib2_lib = 'mod_shib2.so'
471462
} else {
472463
$shib2_lib = 'mod_shib.so'

‎spec/acceptance/vhost_spec.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,8 +1221,7 @@ class { 'apache': }
12211221
end
12221222
end
12231223

1224-
describe 'shibboleth parameters', if: (os[:family] == 'debian' && os[:release] != '7') do
1225-
# Debian 7 is too old for ShibCompatValidUser
1224+
describe 'shibboleth parameters', if: (os[:family] == 'debian') do
12261225
pp = <<-MANIFEST
12271226
class { 'apache': }
12281227
class { 'apache::mod::shib': }

‎spec/classes/mod/php_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
# all the following tests are for legacy php/apache versions. They don't work on modern ubuntu and redhat 8
293293
next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
294294
(facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES') ||
295-
(facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian') ||
295+
(facts[:os]['name'] == 'Debian') ||
296296
(facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS' ||
297297
facts[:os]['name'] == 'Rocky' || facts[:os]['name'] == 'AlmaLinux'))
298298

‎spec/classes/mod/security_spec.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,7 @@
286286
)
287287
}
288288

289-
if (facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu') ||
290-
(facts[:os]['release']['major'].to_i < 9 && facts[:os]['name'] == 'Debian')
289+
if facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu'
291290
it { is_expected.to contain_apache__security__rule_link('base_rules/modsecurity_35_bad_robots.data') }
292291

293292
it {
@@ -316,8 +315,7 @@
316315
}
317316
end
318317

319-
if (facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu') ||
320-
(facts[:os]['release']['major'].to_i < 9 && facts[:os]['name'] == 'Debian')
318+
if facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu'
321319
it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!01\|04\)\)"$} }
322320
it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogParts ABCDZ$} }
323321
it { is_expected.to contain_file('security.conf').with_content %r{^\s+SecAuditLogStorageDir /var/log/httpd/audit$} }

0 commit comments

Comments
 (0)