From eaca662dc1b31d7daf3eaa417aa10319e73da8f2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 12 Aug 2015 19:19:45 -0400 Subject: Make sure that make is installed when bootstrapping propellor. --- debian/changelog | 6 ++++++ debian/control | 1 + 2 files changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2decb1f0..86b1139f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +propellor (2.7.1) UNRELEASED; urgency=medium + + * Make sure that make is installed when bootstrapping propellor. + + -- Joey Hess Wed, 12 Aug 2015 19:19:28 -0400 + propellor (2.7.0) unstable; urgency=medium * Ssh.permitRootLogin type changed to allow configuring WithoutPassword diff --git a/debian/control b/debian/control index 51107783..25c3d474 100644 --- a/debian/control +++ b/debian/control @@ -40,6 +40,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libghc-transformers-dev, libghc-exceptions-dev (>= 0.6), git, + make, Description: property-based host configuration management in haskell Propellor enures that the system it's run in satisfies a list of properties, taking action as necessary when a property is not yet met. -- cgit v1.2.3 From ea2fbd01fe3db1e9f38d2a965d5da7837e3ea657 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Aug 2015 09:59:03 -0400 Subject: changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 86b1139f..24bbe84a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ propellor (2.7.1) UNRELEASED; urgency=medium * Make sure that make is installed when bootstrapping propellor. + * Fix bug in Firewall.toIpTableArg. + Thanks, Antoine Eiche. -- Joey Hess Wed, 12 Aug 2015 19:19:28 -0400 -- cgit v1.2.3 From f4abc3c1cb8f89ee23704b0833b5d72f53abd15b Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Thu, 13 Aug 2015 01:21:23 +0200 Subject: Propellor.Property.Firewall: coding style --- debian/changelog | 2 +- src/Propellor/Property/Firewall.hs | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 24bbe84a..3ee27088 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ propellor (2.7.1) UNRELEASED; urgency=medium * Make sure that make is installed when bootstrapping propellor. - * Fix bug in Firewall.toIpTableArg. + * Fix bug in Firewall's Port datatype to iptable parameter translation code. Thanks, Antoine Eiche. -- Joey Hess Wed, 12 Aug 2015 19:19:28 -0400 diff --git a/src/Propellor/Property/Firewall.hs b/src/Propellor/Property/Firewall.hs index dafdcc6d..dd82fcc8 100644 --- a/src/Propellor/Property/Firewall.hs +++ b/src/Propellor/Property/Firewall.hs @@ -42,13 +42,14 @@ toIpTable r = map Param $ (toIpTableArg (ruleRules r)) ++ [ "-j" , show $ ruleTarget r ] toIpTableArg :: Rules -> [String] -toIpTableArg Everything = [] -toIpTableArg (Proto proto) = ["-p", map toLower $ show proto] +toIpTableArg Everything = [] +toIpTableArg (Proto proto) = ["-p", map toLower $ show proto] toIpTableArg (DPort (Port port)) = ["--dport", show port] -toIpTableArg (DPortRange (Port f, Port t)) = ["--dport", show f ++ ":" ++ show t] -toIpTableArg (IFace iface) = ["-i", iface] -toIpTableArg (Ctstate states) = ["-m", "conntrack","--ctstate", concat $ intersperse "," (map show states)] -toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r' +toIpTableArg (DPortRange + (Port f, Port t)) = ["--dport", show f ++ ":" ++ show t] +toIpTableArg (IFace iface) = ["-i", iface] +toIpTableArg (Ctstate states) = ["-m", "conntrack","--ctstate", concat $ intersperse "," (map show states)] +toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r' data Rule = Rule { ruleChain :: Chain -- cgit v1.2.3 From eb76708b2023f214829d979673cd5e2721ba5fc5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Aug 2015 15:01:44 -0400 Subject: prep release --- debian/changelog | 4 ++-- propellor.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3ee27088..1116016a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -propellor (2.7.1) UNRELEASED; urgency=medium +propellor (2.7.1) unstable; urgency=medium * Make sure that make is installed when bootstrapping propellor. * Fix bug in Firewall's Port datatype to iptable parameter translation code. Thanks, Antoine Eiche. - -- Joey Hess Wed, 12 Aug 2015 19:19:28 -0400 + -- Joey Hess Fri, 14 Aug 2015 15:01:37 -0400 propellor (2.7.0) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index 01c867c8..f00e5594 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 2.7.0 +Version: 2.7.1 Cabal-Version: >= 1.8 License: BSD3 Maintainer: Joey Hess -- cgit v1.2.3