X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=NmcDom.hs;h=1ccf836b9049b8bfe15aebbefda18d67bea4f233;hp=79402e7da1b8f185421842552195c06a8b895812;hb=890c9222bd6d44ff1d499fc3124c53e36d5fe61d;hpb=aa91db8940672a57169b1bb400fa3c1a1e9dd335 diff --git a/NmcDom.hs b/NmcDom.hs index 79402e7..1ccf836 100644 --- a/NmcDom.hs +++ b/NmcDom.hs @@ -155,12 +155,13 @@ data NmcDom = NmcDom { domService :: Maybe [NmcRRService] , domDs :: Maybe [NmcRRDs] , domMx :: Maybe [String] -- Synthetic , domSrv :: Maybe [String] -- Synthetic + , domTlsa :: Maybe [String] -- Synthetic } deriving (Show, Eq) instance Default NmcDom where def = NmcDom Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing - Nothing Nothing Nothing Nothing Nothing Nothing + Nothing Nothing Nothing Nothing Nothing Nothing Nothing instance FromJSON NmcDom where -- Wherever we expect a domain object, there may be a string @@ -197,6 +198,7 @@ instance FromJSON NmcDom where <*> o .:? "ds" <*> return Nothing -- domMx not parsed <*> return Nothing -- domSrv not parsed + <*> return Nothing -- domTlsa not parsed parseJSON _ = empty instance Mergeable NmcDom where @@ -220,6 +222,7 @@ instance Mergeable NmcDom where , domDs = mergelm domDs , domMx = mergelm domMx , domSrv = mergelm domSrv + , domTlsa = mergelm domTlsa } where mergelm x = merge (x sub) (x dom)