aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Meusel <tim@bastelfreak.de>2018-07-11 10:43:41 +0200
committerTim Meusel <tim@bastelfreak.de>2018-07-11 10:43:41 +0200
commit9cdfcfdc397410dc1fe48641ace5fcf47e123085 (patch)
treed95d80f1f32991bb6574901934628dd14bcdecd4
parentd405c11417af82e4f6d146b405c26a9a2019422c (diff)
downloadpuppet-ferm-9cdfcfdc397410dc1fe48641ace5fcf47e123085.tar.gz
puppet-ferm-9cdfcfdc397410dc1fe48641ace5fcf47e123085.tar.bz2
add official ubuntu support
-rw-r--r--metadata.json8
-rw-r--r--spec/classes/ferm_spec.rb9
2 files changed, 16 insertions, 1 deletions
diff --git a/metadata.json b/metadata.json
index 5eb2532..00f8141 100644
--- a/metadata.json
+++ b/metadata.json
@@ -48,6 +48,14 @@
]
},
{
+ "operatingsystem": "Ubuntu",
+ "operatingsystemrelease": [
+ "14.04",
+ "16.04",
+ "18.04"
+ ]
+ },
+ {
"operatingsystem": "Fedora",
"operatingsystemrelease": [
"26"
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