From bd84117979a8e934d0c0922aca4eef27815155f8 Mon Sep 17 00:00:00 2001 From: FĂ©lix Sipma Date: Thu, 4 Feb 2016 16:00:50 +0100 Subject: Firewall: add CustomTarget (cherry picked from commit ecff879cfeacfbff00649f4a3b9dd19eaefe134f) --- src/Propellor/Property/Firewall.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Propellor/Property/Firewall.hs b/src/Propellor/Property/Firewall.hs index 2dff2953..b90f588a 100644 --- a/src/Propellor/Property/Firewall.hs +++ b/src/Propellor/Property/Firewall.hs @@ -39,7 +39,7 @@ rule c t rs = property ("firewall rule: " <> show r) addIpTable toIpTable :: Rule -> [CommandParam] toIpTable r = map Param $ show (ruleChain r) : - toIpTableArg (ruleRules r) ++ [ "-j" , show $ ruleTarget r ] + toIpTableArg (ruleRules r) ++ [ "-j" , fromTarget $ ruleTarget r ] toIpTableArg :: Rules -> [String] toIpTableArg Everything = [] @@ -81,9 +81,13 @@ data Rule = Rule data Chain = INPUT | OUTPUT | FORWARD deriving (Eq, Show) -data Target = ACCEPT | REJECT | DROP | LOG +data Target = ACCEPT | REJECT | DROP | LOG | CustomTarget String deriving (Eq, Show) +fromTarget :: Target -> String +fromTarget (CustomTarget ct) = ct +fromTarget t = show t + data Proto = TCP | UDP | ICMP deriving (Eq, Show) -- cgit v1.2.3