From fc5f400d931c7beafeade383210e92d852a645ff Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 31 Aug 2019 20:28:27 +0200 Subject: Add Debian 10 support & make configdirectory configureable --- manifests/config.pp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'manifests/config.pp') diff --git a/manifests/config.pp b/manifests/config.pp index 23ed390..88fff15 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -9,13 +9,13 @@ class ferm::config { # copy static files to ferm # on a long term point of view, we want to package this - file{'/etc/ferm.d': + file{$ferm::configdirectory: ensure => 'directory', } - -> file{'/etc/ferm.d/definitions': + -> file{"${ferm::configdirectory}/definitions": ensure => 'directory', } - -> file{'/etc/ferm.d/chains': + -> file{"${ferm::configdirectory}/chains": ensure => 'directory', } @@ -25,7 +25,7 @@ class ferm::config { } concat::fragment{'ferm_header.conf': target => $ferm::configfile, - content => epp("${module_name}/ferm_header.conf.epp"), + content => epp("${module_name}/ferm_header.conf.epp", {'configdirectory' => $ferm::configdirectory}), order => '01', } @@ -33,7 +33,8 @@ class ferm::config { target => $ferm::configfile, content => epp( "${module_name}/ferm.conf.epp", { - 'ip' => $_ip, + 'ip' => $_ip, + 'configdirectory' => $ferm::configdirectory, } ), order => '50', -- cgit v1.2.3