cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

better comply with propellor's layout style

This commit is contained in:
Joey Hess 2015-08-13 10:03:06 -04:00
parent f4abc3c1cb
commit 3ee61b70bb
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Propellor/Property/Firewall.hs
View File

@ -42,14 +42,18 @@ toIpTable r = map Param $
(toIpTableArg (ruleRules r)) ++ [ "-j" , show $ ruleTarget r ] (toIpTableArg (ruleRules r)) ++ [ "-j" , show $ ruleTarget r ]
toIpTableArg :: Rules -> [String] toIpTableArg :: Rules -> [String]
toIpTableArg Everything = [] toIpTableArg Everything = []
toIpTableArg (Proto proto) = ["-p", map toLower $ show proto] toIpTableArg (Proto proto) = ["-p", map toLower $ show proto]
toIpTableArg (DPort (Port port)) = ["--dport", show port] toIpTableArg (DPort (Port port)) = ["--dport", show port]
toIpTableArg (DPortRange toIpTableArg (DPortRange (Port f, Port t)) =
(Port f, Port t)) = ["--dport", show f ++ ":" ++ show t] ["--dport", show f ++ ":" ++ show t]
toIpTableArg (IFace iface) = ["-i", iface] toIpTableArg (IFace iface) = ["-i", iface]
toIpTableArg (Ctstate states) = ["-m", "conntrack","--ctstate", concat $ intersperse "," (map show states)] toIpTableArg (Ctstate states) =
toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r' [ "-m"
, "conntrack"
, "--ctstate", concat $ intersperse "," (map show states)
]
toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r'
data Rule = Rule data Rule = Rule
{ ruleChain :: Chain { ruleChain :: Chain