From 55ed8e8743e861e2230e40670a56034353cf4e32 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sun, 26 Feb 2017 16:11:38 -0400
Subject: use ConfigurableValue where applicable

* Removed fromPort (use val instead). (API change)
* Removed several Show instances that were only used for generating
  configuration, replacing with ConfigurableValue instances. (API change)

It's somewhat annoying that IsInfo requires a Show instance.
That's needed to be able to display Info in ghci, but some non-derived Show
instances had to be kept to support that.
---
 src/Propellor/Property/Firewall.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Propellor/Property/Firewall.hs')

diff --git a/src/Propellor/Property/Firewall.hs b/src/Propellor/Property/Firewall.hs
index 3ea19ffa..ce08cc06 100644
--- a/src/Propellor/Property/Firewall.hs
+++ b/src/Propellor/Property/Firewall.hs
@@ -51,9 +51,9 @@ toIpTable r =  map Param $
 toIpTableArg :: Rules -> [String]
 toIpTableArg Everything = []
 toIpTableArg (Proto proto) = ["-p", map toLower $ show proto]
-toIpTableArg (DPort port) = ["--dport", fromPort port]
+toIpTableArg (DPort port) = ["--dport", val port]
 toIpTableArg (DPortRange (portf, portt)) =
-	["--dport", fromPort portf ++ ":" ++ fromPort portt]
+	["--dport", val portf ++ ":" ++ val portt]
 toIpTableArg (InIFace iface) = ["-i", iface]
 toIpTableArg (OutIFace iface) = ["-o", iface]
 toIpTableArg (Ctstate states) =
@@ -100,7 +100,7 @@ toIpTableArg (NotDestination ipwm) =
 	]
 toIpTableArg (NatDestination ip mport) =
 	[ "--to-destination"
-	, fromIPAddr ip ++ maybe "" (\p -> ":" ++ fromPort p) mport
+	, fromIPAddr ip ++ maybe "" (\p -> ":" ++ val p) mport
 	]
 toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r'
 
-- 
cgit v1.3-2-g0d8e


From ae7359a0b0cf58ec83a7ea80fc51d4e6f5be72bf Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sun, 26 Feb 2017 16:45:33 -0400
Subject: convert from* in Firewall to val

---
 src/Propellor/Property/Firewall.hs | 71 +++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 36 deletions(-)

(limited to 'src/Propellor/Property/Firewall.hs')

diff --git a/src/Propellor/Property/Firewall.hs b/src/Propellor/Property/Firewall.hs
index ce08cc06..ab667da3 100644
--- a/src/Propellor/Property/Firewall.hs
+++ b/src/Propellor/Property/Firewall.hs
@@ -15,7 +15,6 @@ module Propellor.Property.Firewall (
 	TCPFlag(..),
 	Frequency(..),
 	IPWithMask(..),
-	fromIPWithMask
 ) where
 
 import Data.Monoid
@@ -44,9 +43,9 @@ rule c tb tg rs = property ("firewall rule: " <> show r) addIpTable
 
 toIpTable :: Rule -> [CommandParam]
 toIpTable r =  map Param $
-	fromChain (ruleChain r) :
+	val (ruleChain r) :
 	toIpTableArg (ruleRules r) ++
-	["-t", fromTable (ruleTable r), "-j", fromTarget (ruleTarget r)]
+	["-t", val (ruleTable r), "-j", val (ruleTarget r)]
 
 toIpTableArg :: Rules -> [String]
 toIpTableArg Everything = []
@@ -64,12 +63,12 @@ toIpTableArg (Ctstate states) =
 toIpTableArg (ICMPType i) =
 	[ "-m"
 	, "icmp"
-	, "--icmp-type", fromICMPTypeMatch i
+	, "--icmp-type", val i
 	]
 toIpTableArg (RateLimit f) =
 	[ "-m"
 	, "limit"
-	, "--limit", fromFrequency f
+	, "--limit", val f
 	]
 toIpTableArg (TCPFlags m c) =
 	[ "-m"
@@ -87,16 +86,16 @@ toIpTableArg (GroupOwner (Group g)) =
 	]
 toIpTableArg (Source ipwm) =
 	[ "-s"
-	, intercalate "," (map fromIPWithMask ipwm)
+	, intercalate "," (map val ipwm)
 	]
 toIpTableArg (Destination ipwm) =
 	[ "-d"
-	, intercalate "," (map fromIPWithMask ipwm)
+	, intercalate "," (map val ipwm)
 	]
 toIpTableArg (NotDestination ipwm) =
 	[ "!"
 	, "-d"
-	, intercalate "," (map fromIPWithMask ipwm)
+	, intercalate "," (map val ipwm)
 	]
 toIpTableArg (NatDestination ip mport) =
 	[ "--to-destination"
@@ -107,10 +106,10 @@ toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r'
 data IPWithMask = IPWithNoMask IPAddr | IPWithIPMask IPAddr IPAddr | IPWithNumMask IPAddr Int
 	deriving (Eq, Show)
 
-fromIPWithMask :: IPWithMask -> String
-fromIPWithMask (IPWithNoMask ip) = fromIPAddr ip
-fromIPWithMask (IPWithIPMask ip ipm) = fromIPAddr ip ++ "/" ++ fromIPAddr ipm
-fromIPWithMask (IPWithNumMask ip m) = fromIPAddr ip ++ "/" ++ show m
+instance ConfigurableValue IPWithMask where
+	val (IPWithNoMask ip) = fromIPAddr ip
+	val (IPWithIPMask ip ipm) = fromIPAddr ip ++ "/" ++ fromIPAddr ipm
+	val (IPWithNumMask ip m) = fromIPAddr ip ++ "/" ++ show m
 
 data Rule = Rule
 	{ ruleChain  :: Chain
@@ -122,33 +121,33 @@ data Rule = Rule
 data Table = Filter | Nat | Mangle | Raw | Security
 	deriving (Eq, Show)
 
-fromTable :: Table -> String
-fromTable Filter = "filter"
-fromTable Nat = "nat"
-fromTable Mangle = "mangle"
-fromTable Raw = "raw"
-fromTable Security = "security"
+instance ConfigurableValue Table where
+	val Filter = "filter"
+	val Nat = "nat"
+	val Mangle = "mangle"
+	val Raw = "raw"
+	val Security = "security"
 
 data Target = ACCEPT | REJECT | DROP | LOG | TargetCustom String
 	deriving (Eq, Show)
 
-fromTarget :: Target -> String
-fromTarget ACCEPT = "ACCEPT"
-fromTarget REJECT = "REJECT"
-fromTarget DROP = "DROP"
-fromTarget LOG = "LOG"
-fromTarget (TargetCustom t) = t
+instance ConfigurableValue Target where
+	val ACCEPT = "ACCEPT"
+	val REJECT = "REJECT"
+	val DROP = "DROP"
+	val LOG = "LOG"
+	val (TargetCustom t) = t
 
 data Chain = INPUT | OUTPUT | FORWARD | PREROUTING | POSTROUTING | ChainCustom String
 	deriving (Eq, Show)
 
-fromChain :: Chain -> String
-fromChain INPUT = "INPUT"
-fromChain OUTPUT = "OUTPUT"
-fromChain FORWARD = "FORWARD"
-fromChain PREROUTING = "PREROUTING"
-fromChain POSTROUTING = "POSTROUTING"
-fromChain (ChainCustom c) = c
+instance ConfigurableValue Chain where
+	val INPUT = "INPUT"
+	val OUTPUT = "OUTPUT"
+	val FORWARD = "FORWARD"
+	val PREROUTING = "PREROUTING"
+	val POSTROUTING = "POSTROUTING"
+	val (ChainCustom c) = c
 
 data Proto = TCP | UDP | ICMP
 	deriving (Eq, Show)
@@ -159,15 +158,15 @@ data ConnectionState = ESTABLISHED | RELATED | NEW | INVALID
 data ICMPTypeMatch = ICMPTypeName String | ICMPTypeCode Int
 	deriving (Eq, Show)
 
-fromICMPTypeMatch :: ICMPTypeMatch -> String
-fromICMPTypeMatch (ICMPTypeName t) = t
-fromICMPTypeMatch (ICMPTypeCode c) = show c
+instance ConfigurableValue ICMPTypeMatch where
+	val (ICMPTypeName t) = t
+	val (ICMPTypeCode c) = val c
 
 data Frequency = NumBySecond Int
 	deriving (Eq, Show)
 
-fromFrequency :: Frequency -> String
-fromFrequency (NumBySecond n) = show n ++ "/second"
+instance ConfigurableValue Frequency where
+	val (NumBySecond n) = val n ++ "/second"
 
 type TCPFlagMask = [TCPFlag]
 
-- 
cgit v1.3-2-g0d8e


From aa225472fb586486b5839e5362a555a476e9a45d Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sun, 26 Feb 2017 16:48:26 -0400
Subject: convert fromIPAddr to val

---
 debian/changelog                   | 2 +-
 src/Propellor/Property/Dns.hs      | 2 +-
 src/Propellor/Property/Firewall.hs | 8 ++++----
 src/Propellor/Property/Munin.hs    | 2 +-
 src/Propellor/Property/Unbound.hs  | 2 +-
 src/Propellor/Spin.hs              | 2 +-
 src/Propellor/Types/Dns.hs         | 9 +++++----
 7 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'src/Propellor/Property/Firewall.hs')

diff --git a/debian/changelog b/debian/changelog
index e3009188..f965a58c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ propellor (3.4.0) UNRELEASED; urgency=medium
   * Added ConfigurableValue type class, for values that can be used in a
     config file, or to otherwise configure a program.
   * The val function converts such values to String.
-  * Removed fromPort (use val instead). (API change)
+  * Removed fromPort and fromIPAddr (use val instead). (API change)
   * Removed several Show instances that were only used for generating
     configuration, replacing with ConfigurableValue instances. (API change)
 
diff --git a/src/Propellor/Property/Dns.hs b/src/Propellor/Property/Dns.hs
index 3fcffed3..889aece5 100644
--- a/src/Propellor/Property/Dns.hs
+++ b/src/Propellor/Property/Dns.hs
@@ -250,7 +250,7 @@ confStanza c =
 	cfgline f v = "\t" ++ f ++ " " ++ v ++ ";"
 	ipblock name l =
 		[ "\t" ++ name ++ " {" ] ++
-		(map (\ip -> "\t\t" ++ fromIPAddr ip ++ ";") l) ++
+		(map (\ip -> "\t\t" ++ val ip ++ ";") l) ++
 		[ "\t};" ]
 	mastersblock
 		| null (confMasters c) = []
diff --git a/src/Propellor/Property/Firewall.hs b/src/Propellor/Property/Firewall.hs
index ab667da3..736a4458 100644
--- a/src/Propellor/Property/Firewall.hs
+++ b/src/Propellor/Property/Firewall.hs
@@ -99,7 +99,7 @@ toIpTableArg (NotDestination ipwm) =
 	]
 toIpTableArg (NatDestination ip mport) =
 	[ "--to-destination"
-	, fromIPAddr ip ++ maybe "" (\p -> ":" ++ val p) mport
+	, val ip ++ maybe "" (\p -> ":" ++ val p) mport
 	]
 toIpTableArg (r :- r') = toIpTableArg r <> toIpTableArg r'
 
@@ -107,9 +107,9 @@ data IPWithMask = IPWithNoMask IPAddr | IPWithIPMask IPAddr IPAddr | IPWithNumMa
 	deriving (Eq, Show)
 
 instance ConfigurableValue IPWithMask where
-	val (IPWithNoMask ip) = fromIPAddr ip
-	val (IPWithIPMask ip ipm) = fromIPAddr ip ++ "/" ++ fromIPAddr ipm
-	val (IPWithNumMask ip m) = fromIPAddr ip ++ "/" ++ show m
+	val (IPWithNoMask ip) = val ip
+	val (IPWithIPMask ip ipm) = val ip ++ "/" ++ val ipm
+	val (IPWithNumMask ip m) = val ip ++ "/" ++ val m
 
 data Rule = Rule
 	{ ruleChain  :: Chain
diff --git a/src/Propellor/Property/Munin.hs b/src/Propellor/Property/Munin.hs
index 13c72f3a..6dab25ef 100644
--- a/src/Propellor/Property/Munin.hs
+++ b/src/Propellor/Property/Munin.hs
@@ -46,7 +46,7 @@ hostListFragment' hs os = concatMap muninHost hs
   where
 	muninHost :: Host -> [String]
 	muninHost h = [ "[" ++ (hostName h) ++ "]"
-		      , "  address " ++ maybe (hostName h) (fromIPAddr . fst) (hOverride h)
+		      , "  address " ++ maybe (hostName h) (val . fst) (hOverride h)
 		      ] ++ (maybe [] (\x -> ["  port " ++ (val $ snd x)]) (hOverride h)) ++ [""]
 	hOverride :: Host -> Maybe (IPAddr, Port)
 	hOverride h = lookup (hostName h) os
diff --git a/src/Propellor/Property/Unbound.hs b/src/Propellor/Property/Unbound.hs
index 9eb8f8c9..470aad7e 100644
--- a/src/Propellor/Property/Unbound.hs
+++ b/src/Propellor/Property/Unbound.hs
@@ -133,7 +133,7 @@ genAddress dom ttl addr = case addr of
 	IPv6 _ -> genAddress' "AAAA" dom ttl addr
 
 genAddress' :: String -> BindDomain -> Maybe Int -> IPAddr -> String
-genAddress' recordtype dom ttl addr = dValue dom ++ " " ++ maybe "" (\ttl' -> val ttl' ++ " ") ttl ++ "IN " ++ recordtype ++ " " ++ fromIPAddr addr
+genAddress' recordtype dom ttl addr = dValue dom ++ " " ++ maybe "" (\ttl' -> val ttl' ++ " ") ttl ++ "IN " ++ recordtype ++ " " ++ val addr
 
 genMX :: BindDomain -> Int -> BindDomain -> String
 genMX dom priority dest = dValue dom ++ " " ++ "MX" ++ " " ++ val priority ++ " " ++ dValue dest
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs
index c6699961f..447f8e9f 100644
--- a/src/Propellor/Spin.hs
+++ b/src/Propellor/Spin.hs
@@ -169,7 +169,7 @@ getSshTarget target hst
 					warningMessage $ "DNS seems out of date for " ++ target ++ " (" ++ why ++ "); using IP address from configuration instead."
 					return ip
 
-	configips = map fromIPAddr $ mapMaybe getIPAddr $
+	configips = map val $ mapMaybe getIPAddr $
 		S.toList $ fromDnsInfo $ fromInfo $ hostInfo hst
 
 -- Update the privdata, repo url, and git repo over the ssh
diff --git a/src/Propellor/Types/Dns.hs b/src/Propellor/Types/Dns.hs
index 8f15d156..4cb8b111 100644
--- a/src/Propellor/Types/Dns.hs
+++ b/src/Propellor/Types/Dns.hs
@@ -5,6 +5,7 @@ module Propellor.Types.Dns where
 import Propellor.Types.OS (HostName)
 import Propellor.Types.Empty
 import Propellor.Types.Info
+import Propellor.Types.ConfigurableValue
 
 import Data.Word
 import qualified Data.Map as M
@@ -19,9 +20,9 @@ type Domain = String
 data IPAddr = IPv4 String | IPv6 String
 	deriving (Read, Show, Eq, Ord)
 
-fromIPAddr :: IPAddr -> String
-fromIPAddr (IPv4 addr) = addr
-fromIPAddr (IPv6 addr) = addr
+instance ConfigurableValue IPAddr where
+	val (IPv4 addr) = addr
+	val (IPv6 addr) = addr
 
 newtype AliasesInfo = AliasesInfo (S.Set HostName)
 	deriving (Show, Eq, Ord, Monoid, Typeable)
@@ -102,7 +103,7 @@ type ReverseIP = String
 
 reverseIP :: IPAddr -> ReverseIP
 reverseIP (IPv4 addr) = intercalate "." (reverse $ split "." addr) ++ ".in-addr.arpa"
-reverseIP addr@(IPv6 _) = reverse (intersperse '.' $ replace ":" "" $ fromIPAddr $ canonicalIP addr) ++ ".ip6.arpa"
+reverseIP addr@(IPv6 _) = reverse (intersperse '.' $ replace ":" "" $ val $ canonicalIP addr) ++ ".ip6.arpa"
 
 -- | Converts an IP address (particularly IPv6) to canonical, fully
 -- expanded form.
-- 
cgit v1.3-2-g0d8e