(MODULES-8108) - Support added for Debian 9 #1849
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@david22swan Rubocop pls! |
david22swan
force-pushed
the
MODULES-8108
branch
from
e411407 to
116cb79
Compare
|
@HelenCampbell Rubocop'ed! |
david22swan
force-pushed
the
MODULES-8108
branch
from
116cb79 to
6f48a4b
Compare
pmcmaw
changed the title
david22swan
force-pushed
the
MODULES-8108
branch
3 times, most recently
from
aaf1188 to
97d9d81
Compare
david22swan
changed the title
|
|
ekohl
reviewed
Nov 21, 2018
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.
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.
@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.
Slightly easier to read now :)
david22swan
force-pushed
the
MODULES-8108
branch
from
97d9d81 to
b7105a3
Compare
Updated default params added. Exclusions added for certain features. Removed some code for Ubuntu 10.04
david22swan
force-pushed
the
MODULES-8108
branch
from
b7105a3 to
e7a8d6b
Compare
|
@ekohl are you happy enough with this PR? |
ekohl
approved these changes
Nov 21, 2018
|
@ekohl Got an Ubuntu PR coming soon after this one. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updated default params added.
Exclusions added for certain features.