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

package: removed a warning for Fedora 18 and below

Browse source 
Those versions no longer supported by the Fedora Project.
This commit is contained in:
Matthew Haughton 2014-12-07 20:59:25 -05:00
parent 5b09b23b12
commit 029f73f4a2
2 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
manifests/package/redhat.pp
View file

@ -27,16 +27,6 @@ class nginx::package::redhat (
} }
case $::operatingsystem { case $::operatingsystem {
'fedora': {
# nginx.org does not supply RPMs for fedora
# fedora 18 provides 1.2.x packages
# fedora 19 has 1.4.x packages are in
# fedora 18 users will need to supply their own nginx 1.4 rpms and/or repo
if $::lsbmajdistrelease and $::lsbmajdistrelease < 19 {
notice("${::operatingsystem} ${::lsbmajdistrelease} does not supply nginx >= 1.4 packages")
}
}
default: { default: {
case $major_dist_release { case $major_dist_release {
5, 6, 7: { 5, 6, 7: {

9
spec/classes/package_spec.rb
View file

@ -100,15 +100,6 @@ describe 'nginx::package' do
it_behaves_like 'debian', 'Ubuntu', 'precise', 'Ubuntu', '12.04' it_behaves_like 'debian', 'Ubuntu', 'precise', 'Ubuntu', '12.04'
end end
context 'fedora' do
# fedora is identical to the rest of osfamily RedHat except for not
# including nginx-release
let(:facts) {{ :operatingsystem => 'Fedora', :osfamily => 'RedHat', :lsbmajdistrelease => 6 }}
it { is_expected.to contain_package('nginx') }
it { is_expected.not_to contain_yumrepo('nginx-release') }
it { is_expected.not_to contain_file('/etc/yum.repos.d/nginx-release.repo') }
end
context 'other' do context 'other' do
let(:facts) {{ :operatingsystem => 'xxx', :osfamily => 'linux' }} let(:facts) {{ :operatingsystem => 'xxx', :osfamily => 'linux' }}
it { is_expected.to contain_package('nginx') } it { is_expected.to contain_package('nginx') }