summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/DnsSec.hs
diff options
context:
space:
mode:
authorJoey Hess2015-01-04 14:20:22 -0400
committerJoey Hess2015-01-04 14:22:44 -0400
commitbb7b8e789104a77b12030df5fe508afbe0eac2a5 (patch)
treee0fa55fe5ebed586b9397b7635d1875534fc28a4 /src/Propellor/Property/DnsSec.hs
parent43e15c8addef95d300fbf1a84b06def9fd099c4d (diff)
add $INCLUDE of pubkeys before zone file is written, to avoid pogoing
Diffstat (limited to 'src/Propellor/Property/DnsSec.hs')
-rw-r--r--src/Propellor/Property/DnsSec.hs7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/Propellor/Property/DnsSec.hs b/src/Propellor/Property/DnsSec.hs
index 37eea09c..b7557006 100644
--- a/src/Propellor/Property/DnsSec.hs
+++ b/src/Propellor/Property/DnsSec.hs
@@ -41,7 +41,6 @@ zoneSigned :: Domain -> FilePath -> RevertableProperty
zoneSigned domain zonefile = RevertableProperty setup cleanup
where
setup = check needupdate (forceZoneSigned domain zonefile)
- `requires` includePubKeys domain zonefile
`requires` toProp (keysInstalled domain)
cleanup = combineProperties ("removed signed zone for " ++ domain)
@@ -66,12 +65,6 @@ zoneSigned domain zonefile = RevertableProperty setup cleanup
t2 <- getModificationTime f
return (t2 >= t1)
-includePubKeys :: Domain -> FilePath -> Property
-includePubKeys domain zonefile = File.containsLines zonefile $
- map mkinclude [PubKSK, PubZSK]
- where
- mkinclude k = "$INCLUDE " ++ keyFn domain k
-
forceZoneSigned :: Domain -> FilePath -> Property
forceZoneSigned domain zonefile = property ("zone signed for " ++ domain) $ liftIO $ do
salt <- take 16 <$> saltSha1