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:31:00 -04:00
parent a407af3f03
commit ca2640d037
Failed to extract signature
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config-joey.hs
View File

@ -217,6 +217,8 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
! Docker.docked oldusenetShellBox ! Docker.docked oldusenetShellBox
& JoeySites.oldUseNetServer hosts & JoeySites.oldUseNetServer hosts
& Dns.secondaryFor ["animx"] hosts "animx.eu.org"
diatom :: Host diatom :: Host
diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64" diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
@ -269,10 +271,8 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
[ (RelDomain "article", CNAME $ AbsDomain "virgil.koldfront.dk") [ (RelDomain "article", CNAME $ AbsDomain "virgil.koldfront.dk")
] ]
& alias "ns3.branchable.com" -- & alias "ns3.branchable.com"
& branchableSecondary -- & branchableSecondary
& Dns.secondaryFor ["animx"] hosts "animx.eu.org"
elephant :: Host elephant :: Host
elephant = standardSystem "elephant.kitenet.net" Unstable "amd64" elephant = standardSystem "elephant.kitenet.net" Unstable "amd64"

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

@ -24,6 +24,7 @@ import Data.String.Utils
oldUseNetServer :: [Host] -> Property HasInfo oldUseNetServer :: [Host] -> Property HasInfo
oldUseNetServer hosts = propertyList "olduse.net server" $ props oldUseNetServer hosts = propertyList "olduse.net server" $ props
& Apt.installed ["leafnode"]
& oldUseNetInstalled "oldusenet-server" & oldUseNetInstalled "oldusenet-server"
& Obnam.latestVersion & Obnam.latestVersion
& oldUseNetBackup & oldUseNetBackup
@ -32,7 +33,6 @@ oldUseNetServer hosts = propertyList "olduse.net server" $ props
removeDirectoryRecursive newsspool removeDirectoryRecursive newsspool
createSymbolicLink (datadir </> "news") newsspool createSymbolicLink (datadir </> "news") newsspool
) )
& Apt.installed ["leafnode"]
& "/etc/news/leafnode/config" `File.hasContent` & "/etc/news/leafnode/config" `File.hasContent`
[ "# olduse.net configuration (deployed by propellor)" [ "# olduse.net configuration (deployed by propellor)"
, "expire = 1000000" -- no expiry via texpire , "expire = 1000000" -- no expiry via texpire