cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2015-01-04 15:00:40 -04:00
parent a6ccfcb189
commit ad984e74e4
Failed to extract signature
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
config-joey.hs
View File

@ -253,10 +253,10 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
& JoeySites.oldUseNetServer hosts & JoeySites.oldUseNetServer hosts
& alias "ns2.kitenet.net" & alias "ns2.kitenet.net"
& myDnsPrimary "kitenet.net" [] & myDnsPrimary False "kitenet.net" []
& myDnsPrimary' "joeyh.name" [] & myDnsPrimary True "joeyh.name" []
& myDnsPrimary "ikiwiki.info" [] & myDnsPrimary False "ikiwiki.info" []
& myDnsPrimary "olduse.net" & myDnsPrimary False "olduse.net"
[ (RelDomain "article", [ (RelDomain "article",
CNAME $ AbsDomain "virgil.koldfront.dk") ] CNAME $ AbsDomain "virgil.koldfront.dk") ]
@ -433,18 +433,8 @@ branchableSecondary = Dns.secondaryFor ["branchable.com"] hosts "branchable.com"
-- Currently using diatom (ns2) as primary with secondaries -- Currently using diatom (ns2) as primary with secondaries
-- elephant (ns3) and gandi. -- elephant (ns3) and gandi.
-- kite handles all mail. -- kite handles all mail.
myDnsPrimary :: Domain -> [(BindDomain, Record)] -> RevertableProperty myDnsPrimary :: Bool -> Domain -> [(BindDomain, Record)] -> RevertableProperty
myDnsPrimary domain extras = Dns.primary hosts domain myDnsPrimary dnssec domain extras = (if dnssec then Dns.signedPrimary (Weekly Nothing) else Dns.primary) hosts domain
(Dns.mkSOA "ns2.kitenet.net" 100) $
[ (RootDomain, NS $ AbsDomain "ns2.kitenet.net")
, (RootDomain, NS $ AbsDomain "ns3.kitenet.net")
, (RootDomain, NS $ AbsDomain "ns6.gandi.net")
, (RootDomain, MX 0 $ AbsDomain "kitenet.net")
-- SPF only allows IP address of kitenet.net to send mail.
, (RootDomain, TXT "v=spf1 a:kitenet.net -all")
] ++ extras
myDnsPrimary' :: Domain -> [(BindDomain, Record)] -> RevertableProperty
myDnsPrimary' domain extras = Dns.signedPrimary Daily hosts domain
(Dns.mkSOA "ns2.kitenet.net" 100) $ (Dns.mkSOA "ns2.kitenet.net" 100) $
[ (RootDomain, NS $ AbsDomain "ns2.kitenet.net") [ (RootDomain, NS $ AbsDomain "ns2.kitenet.net")
, (RootDomain, NS $ AbsDomain "ns3.kitenet.net") , (RootDomain, NS $ AbsDomain "ns3.kitenet.net")

5
src/Propellor/Property/Dns.hs
View File

@ -126,15 +126,14 @@ cleanupPrimary zonefile domain = check (doesFileExist zonefile) $
-- --
-- The 'Recurrance' controls how frequently the signature -- The 'Recurrance' controls how frequently the signature
-- should be regenerated, using a new random salt, to prevent -- should be regenerated, using a new random salt, to prevent
-- zone walking attacks. `Daily` is a reasonable choice. -- zone walking attacks. `Weekly Nothing` is a reasonable choice.
signedPrimary :: Recurrance -> [Host] -> Domain -> SOA -> [(BindDomain, Record)] -> RevertableProperty signedPrimary :: Recurrance -> [Host] -> Domain -> SOA -> [(BindDomain, Record)] -> RevertableProperty
signedPrimary recurrance hosts domain soa rs = RevertableProperty setup cleanup signedPrimary recurrance hosts domain soa rs = RevertableProperty setup cleanup
where where
-- TODO enable dnssec options.
-- dnssec-enable yes; dnssec-validation yes; dnssec-lookaside auto;
setup = combineProperties ("dns primary for " ++ domain ++ " (signed)") setup = combineProperties ("dns primary for " ++ domain ++ " (signed)")
[ setupPrimary zonefile signedZoneFile hosts domain soa rs' [ setupPrimary zonefile signedZoneFile hosts domain soa rs'
, toProp (zoneSigned domain zonefile) , toProp (zoneSigned domain zonefile)
, forceZoneSigned domain zonefile `period` recurrance
] ]
`onChange` Service.reloaded "bind9" `onChange` Service.reloaded "bind9"