From eb1c3c23ef30e95c89671e19c2f6352c876ce836 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 13 Aug 2010 22:16:00 +0200 Subject: [PATCH] ferm: support more than just the filter table --- modules/ferm/manifests/init.pp | 2 +- modules/ferm/templates/ferm-rule.erb | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp index 467af752f..b228e69be 100644 --- a/modules/ferm/manifests/init.pp +++ b/modules/ferm/manifests/init.pp @@ -1,5 +1,5 @@ class ferm { - define rule($domain="ip", $chain="INPUT", $rule, $description="", $prio="00") { + define rule($domain="ip", $table="filter", $chain="INPUT", $rule, $description="", $prio="00") { file { "/etc/ferm/dsa.d/${prio}_${name}": ensure => present, diff --git a/modules/ferm/templates/ferm-rule.erb b/modules/ferm/templates/ferm-rule.erb index b3e637a8e..ed27c423e 100644 --- a/modules/ferm/templates/ferm-rule.erb +++ b/modules/ferm/templates/ferm-rule.erb @@ -4,7 +4,9 @@ ## domain <%= domain %> { - chain <%= chain %> { - <%= rule %>; - } + table <%= table %> { + chain <%= chain %> { + <%= rule %>; + } + } } -- 2.20.1