Skip to content
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

FM-8140 Add Redhat 8 support #1941

Merged
merged 1 commit into from
Sep 4, 2019
Merged

FM-8140 Add Redhat 8 support #1941

merged 1 commit into from
Sep 4, 2019

Conversation

sheenaajay
Copy link
Contributor

@sheenaajay sheenaajay commented Aug 30, 2019

Screen Shot 2019-09-04 at 10 28 58
Screen Shot 2019-09-02 at 15 09 47
Request for a review
Screen Shot 2019-08-30 at 13 04 35

@florindragos florindragos merged commit a214c09 into puppetlabs:master Sep 4, 2019
@@ -30,6 +30,12 @@ class { 'epel':
epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
}
} elsif $::operatingsystemmajrelease == '8' {
class { 'epel':
os_maj_release => "7",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need epel for this ? there is no epel for redhat 8 yet.

@@ -24,13 +24,20 @@
)
}
it { is_expected.to contain_package('mod_security_crs') }
if facts[:os]['release']['major'].to_i > 6
if facts[:os]['release']['major'].to_i > 6 && facts[:os]['release']['major'].to_i <= 7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can do a compare using the gem version functionality. making it a single boolean check
if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')

cegeka-jenkins pushed a commit to cegeka/puppet-apache that referenced this pull request Jul 15, 2020
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.

3 participants