diff --git a/config-joey.hs b/config-joey.hs index d67e3ae..2f33aa3 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -23,6 +23,9 @@ import qualified Propellor.Property.SiteSpecific.GitHome as GitHome import qualified Propellor.Property.SiteSpecific.GitAnnexBuilder as GitAnnexBuilder import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites +main :: IO () +main = defaultMain hosts + -- _ ______`| ,-.__ {- Propellor -- / \___-=O`/|O`/__| (____.' @@ -46,7 +49,6 @@ hosts = -- (o) ` & Network.ipv6to4 & Tor.isBridge & Postfix.satellite - & myDnsSecondary & Docker.configured & alias "shell.olduse.net" @@ -62,6 +64,9 @@ hosts = -- (o) ` -- I'd rather this were on diatom, but it needs unstable. & alias "kgb.kitenet.net" & JoeySites.kgbServer + + & alias "ns9.kitenet.net" + & myDnsSecondary & Docker.garbageCollected `period` Daily & Apt.installed ["git-annex", "mtr", "screen"] @@ -123,12 +128,13 @@ hosts = -- (o) ` & alias "resources.olduse.net" & JoeySites.oldUseNetServer hosts + & alias "ns2.kitenet.net" & myDnsSecondary & Dns.primary hosts "olduse.net" (Dns.mkSOA "ns1.kitenet.net" 100) - [ (RootDomain, NS $ AbsDomain "ns1.kitenet.net") + [ (RootDomain, NS $ AbsDomain "ns2.kitenet.net") , (RootDomain, NS $ AbsDomain "ns6.gandi.net") - , (RootDomain, NS $ AbsDomain "ns2.kitenet.net") + , (RootDomain, NS $ AbsDomain "ns9.kitenet.net") , (RootDomain, MX 0 $ AbsDomain "kitenet.net") , (RootDomain, TXT "v=spf1 a -all") , (RelDomain "article", CNAME $ AbsDomain "virgil.koldfront.dk") @@ -257,9 +263,6 @@ myDnsSecondary = propertyList "dns secondary for all my domains" $ map toProp wren = ["wren.kitenet.net"] branchable = ["branchable.com"] -main :: IO () -main = defaultMain hosts - -- o @@ -287,6 +290,8 @@ monsters = -- but do want to track their public keys etc. & ipv4 "80.68.85.49" & ipv6 "2001:41c8:125:49::10" & alias "kite.kitenet.net" + & alias "kitenet.net" + & alias "ns1.kitenet.net" , host "branchable.com" & ipv4 "66.228.46.55" & ipv6 "2600:3c03::f03c:91ff:fedf:c0e5"