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

Merge pull request #565 from jfryman/revert-560-fix_missing_fact_operatingsystemmajrelease

Browse source 
Revert "changed $::operatingsystemmajrelease to $::lsbmajdistrelease for...
This commit is contained in:
James Fryman 2015-02-06 15:59:20 -06:00
commit a19cb94f23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/params.pp
View file

@ -20,7 +20,7 @@ class nginx::params {
} }
'Debian': { 'Debian': {
if ($::operatingsystem == 'ubuntu' and $::lsbdistcodename in ['lucid', 'precise', 'trusty']) if ($::operatingsystem == 'ubuntu' and $::lsbdistcodename in ['lucid', 'precise', 'trusty'])
or ($::operatingsystem == 'debian' and $::lsbmajdistrelease in ['6', '7']) { or ($::operatingsystem == 'debian' and $::operatingsystemmajrelease in ['6', '7']) {
$_module_os_overrides = { $_module_os_overrides = {
'manage_repo' => true, 'manage_repo' => true,
'daemon_user' => 'www-data', 'daemon_user' => 'www-data',

4
spec/classes/package_spec.rb
View file

@ -52,10 +52,10 @@ describe 'nginx::package' do
end end
end end
shared_examples 'debian' do |operatingsystem, lsbdistcodename, lsbdistid, lsbmajdistrelease| shared_examples 'debian' do |operatingsystem, lsbdistcodename, lsbdistid, operatingsystemmajrelease|
let(:facts) {{ let(:facts) {{
:operatingsystem => operatingsystem, :operatingsystem => operatingsystem,
:lsbmajdistrelease => lsbmajdistrelease, :operatingsystemmajrelease => operatingsystemmajrelease,
:osfamily => 'Debian', :osfamily => 'Debian',
:lsbdistcodename => lsbdistcodename, :lsbdistcodename => lsbdistcodename,
:lsbdistid => lsbdistid :lsbdistid => lsbdistid