summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Propellor/Property/SiteSpecific/JoeySites.hs2
-rw-r--r--config-joey.hs20
2 files changed, 21 insertions, 1 deletions
diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs
index 139e8dc6..fa8a4c6d 100644
--- a/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -111,7 +111,7 @@ mumbleServer hosts = combineProperties "mumble.debian.net"
] Obnam.OnlyClient
`requires` Ssh.keyImported SshRsa "root"
`requires` Ssh.knownHost hosts "turtle.kitenet.net" "root"
- , cmdProperty "chown" ["-R", "mumble-server:mumble-server", "/var/lib/mumble-server"]
+ , trivial $ cmdProperty "chown" ["-R", "mumble-server:mumble-server", "/var/lib/mumble-server"]
, Apt.serviceInstalledRunning "mumble-server"
]
diff --git a/config-joey.hs b/config-joey.hs
index 98e8f6b6..4962f72e 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -133,6 +133,22 @@ hosts = -- (o) `
& alias "ns2.kitenet.net"
& myDnsSecondary
+ & Dns.primary hosts "joeyh.name"
+ (Dns.mkSOA "ns2.kitenet.net" 100)
+ [ (RootDomain, NS $ AbsDomain "ns2.kitenet.net")
+ , (RootDomain, NS $ AbsDomain "ns6.gandi.net")
+ , (RootDomain, NS $ AbsDomain "ns9.kitenet.net")
+ , (RootDomain, MX 0 $ AbsDomain "kitenet.net")
+ , (RootDomain, TXT "v=spf1 a mx ip4:80.68.85.49 ~all")
+ ]
+ & Dns.primary hosts "ikiwiki.info"
+ (Dns.mkSOA "ns2.kitenet.net" 100)
+ [ (RootDomain, NS $ AbsDomain "ns2.kitenet.net")
+ , (RootDomain, NS $ AbsDomain "ns6.gandi.net")
+ , (RootDomain, NS $ AbsDomain "ns9.kitenet.net")
+ , (RootDomain, MX 0 $ AbsDomain "kitenet.net")
+ , (RootDomain, TXT "v=spf1 a -all")
+ ]
& Dns.primary hosts "olduse.net"
(Dns.mkSOA "ns2.kitenet.net" 100)
[ (RootDomain, NS $ AbsDomain "ns2.kitenet.net")
@@ -301,4 +317,8 @@ monsters = -- but do want to track their public keys etc.
& alias "olduse.net"
& alias "www.olduse.net"
& alias "git.olduse.net"
+ & alias "joeyh.name"
+ & alias "campaign.joeyh.name"
+ & alias "ikiwiki.info"
+ & alias "l10n.ikiwiki.info"
]