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

propellor spin

This commit is contained in:
Joey Hess 2014-04-20 21:55:40 -04:00
parent 45552ae3a6
commit 3be3f3f6ef
Failed to extract signature
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -111,7 +111,7 @@ mumbleServer hosts = combineProperties "mumble.debian.net"
] Obnam.OnlyClient ] Obnam.OnlyClient
`requires` Ssh.keyImported SshRsa "root" `requires` Ssh.keyImported SshRsa "root"
`requires` Ssh.knownHost hosts "turtle.kitenet.net" "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" , Apt.serviceInstalledRunning "mumble-server"
] ]

20
config-joey.hs
View File

@ -133,6 +133,22 @@ hosts = -- (o) `
& alias "ns2.kitenet.net" & alias "ns2.kitenet.net"
& myDnsSecondary & 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.primary hosts "olduse.net"
(Dns.mkSOA "ns2.kitenet.net" 100) (Dns.mkSOA "ns2.kitenet.net" 100)
[ (RootDomain, NS $ AbsDomain "ns2.kitenet.net") [ (RootDomain, NS $ AbsDomain "ns2.kitenet.net")
@ -301,4 +317,8 @@ monsters = -- but do want to track their public keys etc.
& alias "olduse.net" & alias "olduse.net"
& alias "www.olduse.net" & alias "www.olduse.net"
& alias "git.olduse.net" & alias "git.olduse.net"
& alias "joeyh.name"
& alias "campaign.joeyh.name"
& alias "ikiwiki.info"
& alias "l10n.ikiwiki.info"
] ]