opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #454 from francis826/redhat_operatingsystemmajrelease

Browse source 
Fix to detect the major release version for redhat/centos 7
This commit is contained in:
Matthew Haughton 2014-09-21 12:03:10 -04:00
commit f4ef3103a6
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
manifests/package/redhat.pp
View file

@ -19,6 +19,13 @@ class nginx::package::redhat (
$package_name = 'nginx', $package_name = 'nginx',
) { ) {
if $::lsbmajdistrelease {
$major_dist_release = $::lsbmajdistrelease
}
else {
$major_dist_release = $::operatingsystemmajrelease
}
case $::operatingsystem { case $::operatingsystem {
'fedora': { 'fedora': {
# nginx.org does not supply RPMs for fedora # nginx.org does not supply RPMs for fedora
@ -31,9 +38,9 @@ class nginx::package::redhat (
} }
} }
default: { default: {
case $::lsbmajdistrelease { case $major_dist_release {
5, 6, 7: { 5, 6, 7: {
$os_rel = $::lsbmajdistrelease $os_rel = $major_dist_release
} }
default: { default: {
# Amazon uses the year as the $::lsbmajdistrelease # Amazon uses the year as the $::lsbmajdistrelease