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/DnsSec.hs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/Propellor/Property/DnsSec.hs') diff --git a/src/Propellor/Property/DnsSec.hs b/src/Propellor/Property/DnsSec.hs index b7557006..3acaee8d 100644 --- a/src/Propellor/Property/DnsSec.hs +++ b/src/Propellor/Property/DnsSec.hs @@ -8,7 +8,7 @@ import qualified Propellor.Property.File as File -- signedPrimary uses this, so this property does not normally need to be -- used directly. keysInstalled :: Domain -> RevertableProperty -keysInstalled domain = RevertableProperty setup cleanup +keysInstalled domain = setup cleanup where setup = propertyList "DNSSEC keys installed" $ map installkey keys @@ -38,16 +38,14 @@ keysInstalled domain = RevertableProperty setup cleanup -- signedPrimary uses this, so this property does not normally need to be -- used directly. zoneSigned :: Domain -> FilePath -> RevertableProperty -zoneSigned domain zonefile = RevertableProperty setup cleanup +zoneSigned domain zonefile = setup cleanup where setup = check needupdate (forceZoneSigned domain zonefile) `requires` toProp (keysInstalled domain) - cleanup = combineProperties ("removed signed zone for " ++ domain) - [ File.notPresent (signedZoneFile zonefile) - , File.notPresent dssetfile - , toProp (revert (keysInstalled domain)) - ] + cleanup = File.notPresent (signedZoneFile zonefile) + `before` File.notPresent dssetfile + `before` toProp (revert (keysInstalled domain)) dssetfile = dir "-" ++ domain ++ "." dir = takeDirectory zonefile @@ -65,7 +63,7 @@ zoneSigned domain zonefile = RevertableProperty setup cleanup t2 <- getModificationTime f return (t2 >= t1) -forceZoneSigned :: Domain -> FilePath -> Property +forceZoneSigned :: Domain -> FilePath -> Property NoInfo forceZoneSigned domain zonefile = property ("zone signed for " ++ domain) $ liftIO $ do salt <- take 16 <$> saltSha1 let p = proc "dnssec-signzone" -- cgit v1.2.3