summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2015-01-04 15:00:40 -0400
committerJoey Hess2015-01-04 15:00:40 -0400
commitad984e74e4c85f0305d9ce8255ac8909038be82d (patch)
tree295822144a2a8f73b9d57f42a06ead4b972e25e5 /config-joey.hs
parenta6ccfcb18973db44a5c09cf4e4cac7a1b0ebd58c (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs22
1 files changed, 6 insertions, 16 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 73674ea6..8cfb9250 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -253,10 +253,10 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
& JoeySites.oldUseNetServer hosts
& alias "ns2.kitenet.net"
- & myDnsPrimary "kitenet.net" []
- & myDnsPrimary' "joeyh.name" []
- & myDnsPrimary "ikiwiki.info" []
- & myDnsPrimary "olduse.net"
+ & myDnsPrimary False "kitenet.net" []
+ & myDnsPrimary True "joeyh.name" []
+ & myDnsPrimary False "ikiwiki.info" []
+ & myDnsPrimary False "olduse.net"
[ (RelDomain "article",
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
-- elephant (ns3) and gandi.
-- kite handles all mail.
-myDnsPrimary :: Domain -> [(BindDomain, Record)] -> RevertableProperty
-myDnsPrimary domain extras = 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
+myDnsPrimary :: Bool -> Domain -> [(BindDomain, Record)] -> RevertableProperty
+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")