From 3d21a2df5433a725b6060d9533da86aacb7a6527 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 4 Jan 2015 13:33:14 -0400 Subject: [PATCH] propellor spin --- config-joey.hs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/config-joey.hs b/config-joey.hs index 8d83458..73674ea 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -25,8 +25,6 @@ import qualified Propellor.Property.Grub as Grub import qualified Propellor.Property.Obnam as Obnam import qualified Propellor.Property.Gpg as Gpg import qualified Propellor.Property.Systemd as Systemd -import qualified Propellor.Property.Chroot as Chroot -import qualified Propellor.Property.Debootstrap as Debootstrap import qualified Propellor.Property.OS as OS import qualified Propellor.Property.HostingProvider.DigitalOcean as DigitalOcean import qualified Propellor.Property.HostingProvider.CloudAtCost as CloudAtCost @@ -256,7 +254,7 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64" & alias "ns2.kitenet.net" & myDnsPrimary "kitenet.net" [] - & myDnsPrimary "joeyh.name" [] + & myDnsPrimary' "joeyh.name" [] & myDnsPrimary "ikiwiki.info" [] & myDnsPrimary "olduse.net" [ (RelDomain "article", @@ -437,6 +435,16 @@ branchableSecondary = Dns.secondaryFor ["branchable.com"] hosts "branchable.com" -- 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 (Dns.mkSOA "ns2.kitenet.net" 100) $ [ (RootDomain, NS $ AbsDomain "ns2.kitenet.net") , (RootDomain, NS $ AbsDomain "ns3.kitenet.net")