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

propellor spin

This commit is contained in:
Joey Hess 2015-02-10 22:39:02 -04:00
parent ee3c6c06bc
commit 2759d17079
Failed to extract signature
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
config-joey.hs
View File

@ -184,11 +184,6 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
& JoeySites.gitAnnexDistributor & JoeySites.gitAnnexDistributor
& JoeySites.tmp & JoeySites.tmp
& alias "ns4.kitenet.net"
& myDnsSecondary
& alias "ns4.branchable.com"
& branchableSecondary
& alias "bitlbee.kitenet.net" & alias "bitlbee.kitenet.net"
& Apt.serviceInstalledRunning "bitlbee" & Apt.serviceInstalledRunning "bitlbee"
& "/etc/bitlbee/bitlbee.conf" `File.hasContent` & "/etc/bitlbee/bitlbee.conf" `File.hasContent`
@ -215,9 +210,17 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
! Docker.docked oldusenetShellBox ! Docker.docked oldusenetShellBox
& alias "nntp.olduse.net" & alias "nntp.olduse.net"
& alias "resources.olduse.net"
& JoeySites.oldUseNetServer hosts & JoeySites.oldUseNetServer hosts
& alias "ns4.kitenet.net"
& myDnsPrimary True "kitenet.net" []
& myDnsPrimary True "joeyh.name" []
& myDnsPrimary True "ikiwiki.info" []
& myDnsPrimary True "olduse.net"
[ (RelDomain "article", CNAME $ AbsDomain "virgil.koldfront.dk")
]
& alias "ns4.branchable.com"
& branchableSecondary
& Dns.secondaryFor ["animx"] hosts "animx.eu.org" & Dns.secondaryFor ["animx"] hosts "animx.eu.org"
diatom :: Host diatom :: Host
@ -259,7 +262,7 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
"da89f112-808b-420a-b468-d990ae2e5b52" "da89f112-808b-420a-b468-d990ae2e5b52"
[] []
& JoeySites.oldUseNetServer hosts -- & JoeySites.oldUseNetServer hosts
& alias "ns2.kitenet.net" & alias "ns2.kitenet.net"
& myDnsPrimary True "kitenet.net" [] & myDnsPrimary True "kitenet.net" []