|
4 | 4 |
|
5 | 5 | describe 'apache::vhost', type: :define do |
6 | 6 | describe 'os-independent items' do |
7 | | - on_supported_os.each do |os, facts| |
| 7 | + on_supported_os.each do |os, os_facts| |
8 | 8 | let(:apache_name) { facts[:os]['family'] == 'RedHat' ? 'httpd' : 'apache2' } |
9 | 9 |
|
10 | 10 | let :pre_condition do |
|
24 | 24 |
|
25 | 25 | context "on #{os} " do |
26 | 26 | let :facts do |
27 | | - facts |
| 27 | + os_facts |
28 | 28 | end |
29 | 29 |
|
30 | 30 | describe 'basic assumptions' do |
|
34 | 34 | it { is_expected.to contain_class('apache::params') } |
35 | 35 | it { is_expected.to contain_apache__listen(params[:port]) } |
36 | 36 | # namebased virualhost is only created on apache 2.2 and older |
37 | | - if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) || |
38 | | - (facts[:os]['name'] == 'Amazon') || |
39 | | - (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12) |
| 37 | + if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i < 7) || |
| 38 | + (os_facts[:os]['name'] == 'Amazon') || |
| 39 | + (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i < 12) |
40 | 40 | it { is_expected.to contain_apache__namevirtualhost("*:#{params[:port]}") } |
41 | 41 | end |
42 | 42 | end |
|
586 | 586 | 'require' => 'Package[httpd]', |
587 | 587 | 'notify' => 'Class[Apache::Service]') |
588 | 588 | } |
589 | | - if facts[:os]['release']['major'].to_i >= 18 && facts[:os]['name'] == 'Ubuntu' |
| 589 | + if os_facts[:os]['release']['major'].to_i >= 18 && os_facts[:os]['name'] == 'Ubuntu' |
590 | 590 | it { |
591 | 591 | is_expected.to contain_file('30-rspec.example.com.conf symlink').with('ensure' => 'link', |
592 | 592 | 'path' => "/etc/#{apache_name}/sites-enabled/30-rspec.example.com.conf") |
|
1703 | 1703 | it { is_expected.to compile } |
1704 | 1704 | it { is_expected.to contain_concat('25-rspec.example.com.conf') } |
1705 | 1705 | # this works only with apache 2.4 and newer |
1706 | | - if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i > 6) || |
1707 | | - (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i > 11) |
| 1706 | + if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i > 6) || |
| 1707 | + (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i > 11) |
1708 | 1708 | it { |
1709 | 1709 | is_expected.to contain_concat__fragment('rspec.example.com-directories').with( |
1710 | 1710 | content: %r{^\s+Require all granted$}, |
|
1717 | 1717 |
|
1718 | 1718 | # the following style is only present on Apache 2.2 |
1719 | 1719 | # That is used in SLES 11, RHEL6, Amazon Linux |
1720 | | - if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) || |
1721 | | - (facts[:os]['name'] == 'Amazon') || |
1722 | | - (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12) |
| 1720 | + if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i < 7) || |
| 1721 | + (os_facts[:os]['name'] == 'Amazon') || |
| 1722 | + (os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i < 12) |
1723 | 1723 | context 'apache 2.2 access controls on directories' do |
1724 | 1724 | let :params do |
1725 | 1725 | { |
|
1760 | 1760 | end |
1761 | 1761 |
|
1762 | 1762 | # this setup uses fastcgi wich isn't available on RHEL 7 / RHEL 8 / Debian / Ubuntu |
1763 | | - unless facts[:os]['family'] == 'Debian' || (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i >= 7) |
| 1763 | + unless os_facts[:os]['family'] == 'Debian' || (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i >= 7) |
1764 | 1764 | describe 'fastcgi options' do |
1765 | 1765 | let :params do |
1766 | 1766 | { |
|
0 commit comments