Skip to content

(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

Merged
merged 1 commit into from
Nov 21, 2018

Conversation

david22swan
Copy link
Member

Updated default params added.
Exclusions added for certain features.

@HelenCampbell
Copy link
Contributor

@david22swan Rubocop pls!

@david22swan
Copy link
Member Author

@HelenCampbell Rubocop'ed!

@pmcmaw pmcmaw changed the title (MODULES-8108) - Support added for Debian 9 WIP - (MODULES-8108) - Support added for Debian 9 Nov 19, 2018
@david22swan david22swan force-pushed the MODULES-8108 branch 3 times, most recently from aaf1188 to 97d9d81 Compare November 21, 2018 13:26
@david22swan david22swan changed the title WIP - (MODULES-8108) - Support added for Debian 9 (MODULES-8108) - Support added for Debian 9 Nov 21, 2018
@david22swan
Copy link
Member Author

screen shot 2018-11-21 at 3 44 24 pm

@@ -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') {
Copy link
Collaborator

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

Copy link
Member Author

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.

Copy link
Collaborator

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

Updated default params added.
Exclusions added for certain features.
Removed some code for Ubuntu 10.04
@pmcmaw
Copy link
Contributor

pmcmaw commented Nov 21, 2018

@ekohl are you happy enough with this PR?
I don't want to cut your review short, so when you are happy I will merge. I have had a look and everything looks fine to me :-)

Copy link
Collaborator

@ekohl ekohl left a 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.

@david22swan
Copy link
Member Author

@ekohl Got an Ubuntu PR coming soon after this one.

@pmcmaw pmcmaw merged commit b21ec23 into puppetlabs:master Nov 21, 2018
@david22swan david22swan deleted the MODULES-8108 branch November 22, 2018 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants