Skip to content

Commit fa01b15

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

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

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/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)