diff options
| author | Fabien COMBERNOUS <Dan33l@users.noreply.github.com> | 2019-09-12 23:06:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 23:06:55 +0200 |
| commit | 2455de32311040de0d608d8cc151aa6395700e8f (patch) | |
| tree | a28cc8e9d862abac0491b4d2cfd412461567a05c /spec/classes | |
| parent | 439e71b110e769d8164c4491a6662ac6f2b089db (diff) | |
| parent | 221c45769e56ffda0ac82bd035e0ef5f37706836 (diff) | |
| download | puppet-ferm-2455de32311040de0d608d8cc151aa6395700e8f.tar.gz puppet-ferm-2455de32311040de0d608d8cc151aa6395700e8f.tar.bz2 | |
Merge pull request #69 from bastelfreak/debian
readd Debian 9/10 support
Diffstat (limited to 'spec/classes')
| -rw-r--r-- | spec/classes/ferm_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/classes/ferm_spec.rb b/spec/classes/ferm_spec.rb index 225577b..3257fca 100644 --- a/spec/classes/ferm_spec.rb +++ b/spec/classes/ferm_spec.rb @@ -17,7 +17,7 @@ describe 'ferm' do it { is_expected.to contain_class('ferm::service') } it { is_expected.to contain_class('ferm::install') } it { is_expected.to contain_package('ferm') } - if facts[:os]['release']['major'].to_i == 10 + if facts[:os]['name'] == 'Debian' it { is_expected.to contain_file('/etc/ferm/ferm.d') } it { is_expected.to contain_file('/etc/ferm/ferm.d/definitions') } it { is_expected.to contain_file('/etc/ferm/ferm.d/chains') } @@ -51,7 +51,7 @@ describe 'ferm' do { manage_configfile: true } end - if facts[:os]['name'] == 'Ubuntu' || facts[:os]['release']['major'].to_i == 10 + if facts[:os]['family'] == 'Debian' it { is_expected.to contain_concat('/etc/ferm/ferm.conf') } else it { is_expected.to contain_concat('/etc/ferm.conf') } @@ -102,7 +102,7 @@ describe 'ferm' do it { is_expected.to contain_concat__fragment('filter-INPUT-policy') } it { is_expected.to contain_concat__fragment('filter-FORWARD-policy') } it { is_expected.to contain_concat__fragment('filter-OUTPUT-policy') } - if facts[:os]['release']['major'].to_i == 10 + if facts[:os]['name'] == 'Debian' it { is_expected.to contain_concat('/etc/ferm/ferm.d/chains/raw-PREROUTING.conf') } it { is_expected.to contain_concat('/etc/ferm/ferm.d/chains/raw-OUTPUT.conf') } it { is_expected.to contain_concat('/etc/ferm/ferm.d/chains/nat-PREROUTING.conf') } |