-
Notifications
You must be signed in to change notification settings - Fork 1.1k
(MODULES-8108) - Support added for Debian 9 #1849
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
Conversation
@david22swan Rubocop pls! |
e411407
to
116cb79
Compare
@HelenCampbell Rubocop'ed! |
116cb79
to
6f48a4b
Compare
aaf1188
to
97d9d81
Compare
manifests/mod/dav_svn.pp
Outdated
@@ -13,7 +13,7 @@ | |||
|
|||
::apache::mod { 'dav_svn': } | |||
|
|||
if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04' and $::operatingsystemrelease != '10.04' and $::operatingsystemmajrelease != '16.04') { | |||
if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04' and $::operatingsystemrelease != '10.04' and $::operatingsystemmajrelease != '16.04' and $::operatingsystemmajrelease != '9') { |
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.
How about:
if $::osfamily == 'Debian' and $::operatingsystemrelease != '10.04' and ! ($::operatingsystemmajrelease in ['6', '10.04', '16.04', '9']) {
And maybe just drop 10.04 here :)
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.
@ekohl Updated :). Considered removing Deb 6 as well but as it's not as out of date decided to leave for now.
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.
Slightly easier to read now :)
97d9d81
to
b7105a3
Compare
Updated default params added. Exclusions added for certain features. Removed some code for Ubuntu 10.04
b7105a3
to
e7a8d6b
Compare
@ekohl are you happy enough with this 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.
Forgot to mark it as an approval. I do wonder about some of the conditionals if they should also apply to Ubuntu 18.04 but that's a separate PR.
@ekohl Got an Ubuntu PR coming soon after this one. |
Updated default params added.
Exclusions added for certain features.