summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-02-10 22:31:00 -0400
committerJoey Hess2015-02-10 22:31:00 -0400
commitca2640d0371222ffade34044380a4086cb5917c4 (patch)
treedd5bdf928086e22a52d902d606dd16e47ca79d9f
parenta407af3f03b31ec653a21ba0e1db49389c68c246 (diff)
propellor spin
-rw-r--r--config-joey.hs8
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
2 files changed, 5 insertions, 5 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 91daff08..5139ab9b 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -217,6 +217,8 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
! Docker.docked oldusenetShellBox
& JoeySites.oldUseNetServer hosts
+
+ & Dns.secondaryFor ["animx"] hosts "animx.eu.org"
diatom :: Host
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")
]
- & alias "ns3.branchable.com"
- & branchableSecondary
-
- & Dns.secondaryFor ["animx"] hosts "animx.eu.org"
+ -- & alias "ns3.branchable.com"
+ -- & branchableSecondary
elephant :: Host
elephant = standardSystem "elephant.kitenet.net" Unstable "amd64"
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 3341a3dd..3d453a8a 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -24,6 +24,7 @@ import Data.String.Utils
oldUseNetServer :: [Host] -> Property HasInfo
oldUseNetServer hosts = propertyList "olduse.net server" $ props
+ & Apt.installed ["leafnode"]
& oldUseNetInstalled "oldusenet-server"
& Obnam.latestVersion
& oldUseNetBackup
@@ -32,7 +33,6 @@ oldUseNetServer hosts = propertyList "olduse.net server" $ props
removeDirectoryRecursive newsspool
createSymbolicLink (datadir </> "news") newsspool
)
- & Apt.installed ["leafnode"]
& "/etc/news/leafnode/config" `File.hasContent`
[ "# olduse.net configuration (deployed by propellor)"
, "expire = 1000000" -- no expiry via texpire