-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Drop EoL Debian 9 and older code #2479
Conversation
spec/classes/mod/security_spec.rb
Outdated
@@ -286,8 +286,7 @@ | |||
) | |||
} | |||
|
|||
if (facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu') || | |||
(facts[:os]['release']['major'].to_i < 9 && facts[:os]['name'] == 'Debian') | |||
if (facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will drop the Ubuntu 16 code in another PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Manifests look good, but should we also clean up the tests?
puppetlabs-apache/spec/acceptance/vhost_spec.rb
Lines 1224 to 1225 in 9c73e67
describe 'shibboleth parameters', if: (os[:family] == 'debian' && os[:release] != '7') do | |
# Debian 7 is too old for ShibCompatValidUser |
(facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian') || |
And since I'm too lazy to link directly:
manifests/mod/md.pp:# @note Unsupported platforms: CentOS: 6, 7; Debian: 8, 9; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
manifests/mod/shib.pp:# @note Unsupported platforms: RedHat: all; CentOS: all; Scientific: all; SLES: all; Debian: 7, 8; Ubuntu: all; OracleLinux: all
manifests/mod/apreq2.pp:# @note Unsupported platforms: CentOS: all; Debian: 8; OracleLinux: all; RedHat: all; Scientific: all; SLES: all; Ubuntu: all
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor note, otherwise 👍
spec/acceptance/vhost_spec.rb
Outdated
@@ -1221,7 +1221,7 @@ class { 'apache': } | |||
end | |||
end | |||
|
|||
describe 'shibboleth parameters', if: (os[:family] == 'debian' && os[:release] != '7') do | |||
describe 'shibboleth parameters', if: (os[:family] == 'debian') do | |||
# Debian 7 is too old for ShibCompatValidUser |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# Debian 7 is too old for ShibCompatValidUser |
Debian 9 was already removed from metadata.json and isn't supported anymore. This PR drops some code leftovers.
Debian 9 was already removed from metadata.json and isn't supported anymore. This PR drops some code leftovers.
Summary
Provide a detailed description of all the changes present in this pull request.
Additional Context
Add any additional context about the problem here.
Related Issues (if any)
Mention any related issues or pull requests.
Checklist
puppet apply
)