Browse Source

test(config): fix for Amazon Linux 2 & Oracle Linux 7/8

tags/v2.6.0
Imran Iqbal 3 years ago
parent
commit
ab39c8f7c3
No account linked to committer's email address
2 changed files with 5 additions and 4 deletions
  1. +4
    -4
      test/integration/default/controls/config.rb
  2. +1
    -0
      test/integration/default/controls/service.rb

+ 4
- 4
test/integration/default/controls/config.rb View File

server_available = '/etc/nginx/sites-available' server_available = '/etc/nginx/sites-available'
server_enabled = '/etc/nginx/sites-enabled' server_enabled = '/etc/nginx/sites-enabled'


# Override by OS
case os[:name]
when 'redhat', 'centos', 'fedora'
# Override by platform family
case platform[:family]
when 'redhat','fedora'
server_available = '/etc/nginx/conf.d' server_available = '/etc/nginx/conf.d'
server_enabled = '/etc/nginx/conf.d' server_enabled = '/etc/nginx/conf.d'
when 'opensuse'
when 'suse'
server_available = '/etc/nginx/vhosts.d' server_available = '/etc/nginx/vhosts.d'
server_enabled = '/etc/nginx/vhosts.d' server_enabled = '/etc/nginx/vhosts.d'
end end

+ 1
- 0
test/integration/default/controls/service.rb View File

title 'should be running and enabled' title 'should be running and enabled'


describe service('nginx') do describe service('nginx') do
it { should be_installed }
it { should be_enabled } it { should be_enabled }
it { should be_running } it { should be_running }
end end

Loading…
Cancel
Save