From 9cdfcfdc397410dc1fe48641ace5fcf47e123085 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 11 Jul 2018 10:43:41 +0200 Subject: add official ubuntu support --- metadata.json | 8 ++++++++ spec/classes/ferm_spec.rb | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 5eb2532..00f8141 100644 --- a/metadata.json +++ b/metadata.json @@ -47,6 +47,14 @@ "11" ] }, + { + "operatingsystem": "Ubuntu", + "operatingsystemrelease": [ + "14.04", + "16.04", + "18.04" + ] + }, { "operatingsystem": "Fedora", "operatingsystemrelease": [ diff --git a/spec/classes/ferm_spec.rb b/spec/classes/ferm_spec.rb index e039c14..dbf9cbd 100644 --- a/spec/classes/ferm_spec.rb +++ b/spec/classes/ferm_spec.rb @@ -31,14 +31,21 @@ describe 'ferm' do it { is_expected.to compile.with_all_deps } it { is_expected.to contain_service('ferm') } + if facts[:os]['name'] == "Ubuntu" + it { is_expected.to contain_file_line('enable_ferm') } + end end context 'with managed configfile' do let :params do { manage_configfile: true } end + if facts[:os]['name'] == 'Ubuntu' + it { is_expected.to contain_concat('/etc/ferm/ferm.conf') } + else + it { is_expected.to contain_concat('/etc/ferm.conf') } + end it { is_expected.to compile.with_all_deps } - it { is_expected.to contain_concat('/etc/ferm.conf') } it { is_expected.to contain_concat__fragment('ferm_header.conf') } it { is_expected.to contain_concat__fragment('ferm.conf') } end -- cgit v1.2.3