From 0ee04ecc43e047b00437fb660e71f7dd67dd3afc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 24 Jan 2015 22:38:10 -0400 Subject: GADT properties seem to work (untested) * Property has been converted to a GADT, and will be Property NoInfo or Property HasInfo. This was done to make sure that ensureProperty is only used on properties that do not have Info. Transition guide: - Change all "Property" to "Property NoInfo" or "Property WithInfo" (The compiler can tell you if you got it wrong!) - To construct a RevertableProperty, it is useful to use the new () operator - Constructing a list of properties can be problimatic, since Property NoInto and Property WithInfo are different types and cannot appear in the same list. To deal with this, "props" has been added, and can built up a list of properties of different types, using the same (&) and (!) operators that are used to build up a host's properties. --- src/Propellor/Property/Network.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Propellor/Property/Network.hs') diff --git a/src/Propellor/Property/Network.hs b/src/Propellor/Property/Network.hs index e04290aa..4d7ccffb 100644 --- a/src/Propellor/Property/Network.hs +++ b/src/Propellor/Property/Network.hs @@ -5,7 +5,7 @@ import Propellor.Property.File type Interface = String -ifUp :: Interface -> Property +ifUp :: Interface -> Property NoInfo ifUp iface = cmdProperty "ifup" [iface] -- | Resets /etc/network/interfaces to a clean and empty state, @@ -15,7 +15,7 @@ ifUp iface = cmdProperty "ifup" [iface] -- This can be used as a starting point to defining other interfaces. -- -- No interfaces are brought up or down by this property. -cleanInterfacesFile :: Property +cleanInterfacesFile :: Property NoInfo cleanInterfacesFile = hasContent interfacesFile [ "# Deployed by propellor, do not edit." , "" @@ -38,7 +38,7 @@ cleanInterfacesFile = hasContent interfacesFile -- -- (ipv6 addresses are not included because it's assumed they come up -- automatically in most situations.) -static :: Interface -> Property +static :: Interface -> Property NoInfo static iface = check (not <$> doesFileExist f) setup `describe` desc `requires` interfacesDEnabled @@ -69,7 +69,7 @@ static iface = check (not <$> doesFileExist f) setup _ -> Nothing -- | 6to4 ipv6 connection, should work anywhere -ipv6to4 :: Property +ipv6to4 :: Property NoInfo ipv6to4 = hasContent (interfaceDFile "sit0") [ "# Deployed by propellor, do not edit." , "iface sit0 inet6 static" @@ -90,6 +90,6 @@ interfaceDFile :: Interface -> FilePath interfaceDFile iface = "/etc/network/interfaces.d" iface -- | Ensures that files in the the interfaces.d directory are used. -interfacesDEnabled :: Property +interfacesDEnabled :: Property NoInfo interfacesDEnabled = containsLine interfacesFile "source-directory interfaces.d" `describe` "interfaces.d directory enabled" -- cgit v1.2.3