@@ -419,8 +419,7 @@ def apache_mod_php_modulename
419419 when 'amazon'
420420 'php8_module'
421421 when 'rhel'
422- # TODO: Remove when we no longer support RHEL 7
423- node [ 'platform_version' ] . to_i >= 8 ? 'php7_module' : 'php5_module'
422+ 'php7_module'
424423 when 'debian'
425424 if platform? ( 'debian' ) && node [ 'platform_version' ] . to_i >= 12
426425 'php_module'
@@ -457,8 +456,7 @@ def apache_mod_php_filename
457456 'libphp7.0.so'
458457 end
459458 when 'rhel'
460- # TODO: Remove when we no longer support RHEL 7
461- node [ 'platform_version' ] . to_i >= 8 ? 'libphp7.so' : 'libphp5.so'
459+ 'libphp7.so'
462460 when 'suse'
463461 if platform? ( 'opensuse' ) && node [ 'platform_version' ] . to_f >= 15.5
464462 'mod_php8.so'
@@ -474,8 +472,7 @@ def apache_mod_wsgi_package
474472 when 'debian'
475473 'libapache2-mod-wsgi-py3'
476474 when 'rhel' , 'fedora' , 'amazon'
477- # TODO: Remove when we no longer support RHEL 7
478- node [ 'platform_version' ] . to_i >= 8 ? 'python3-mod_wsgi' : 'mod_wsgi'
475+ 'python3-mod_wsgi'
479476 when 'suse'
480477 'apache2-mod_wsgi-python3'
481478 end
@@ -490,8 +487,7 @@ def apache_mod_wsgi_filename
490487 end
491488
492489 def apache_mod_auth_cas_install_method
493- # TODO: Simplify when we no longer support RHEL 7
494- if ( platform_family? ( 'rhel' ) && node [ 'platform_version' ] . to_i >= 8 ) || platform_family? ( 'suse' , 'fedora' , 'amazon' )
490+ if platform_family? ( 'rhel' , 'suse' , 'fedora' , 'amazon' )
495491 'source'
496492 else
497493 'package'
0 commit comments