summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-05-29 19:18:35 -0400
committerJoey Hess2015-05-29 19:18:35 -0400
commit78fecfcba47901c6c3ff5087cc091d802c5c99d2 (patch)
tree4dca96182ca3c36039c3e881f5d9e3e6ea0c1940
parenta9086c0eea725c8d093a06d0a5dab53b4bcf099a (diff)
propellor spin
-rw-r--r--config-joey.hs24
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs20
2 files changed, 30 insertions, 14 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 4978c8af..92a6c318 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -129,17 +129,33 @@ orca = standardSystem "orca.kitenet.net" Unstable "amd64"
& Apt.unattendedUpgrades
& Postfix.satellite
+ & Apt.serviceInstalledRunning "ntp"
& Systemd.persistentJournal
- & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer "amd64" 15 "2h")
- & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer "i386" 15 "2h")
- & Systemd.nspawned (GitAnnexBuilder.androidAutoBuilderContainer (Cron.Times "1 1 * * *") "3h")
+
+ & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer
+ (System (Debian Testing) "amd64") fifteenpast "2h")
+ & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer
+ (System (Debian Testing) "i386") fifteenpast "2h")
+ & Systemd.nspawned (GitAnnexBuilder.androidAutoBuilderContainer
+ (Cron.Times "1 1 * * *") "3h")
+ where
+ fifteenpast = Cron.Times "15 * * * *"
honeybee :: Host
-honeybee = standardSystem "honeybee.kitenet.net" Unstable "armhf"
+honeybee = standardSystem "honeybee.kitenet.net" Testing "armhf"
[ "Arm git-annex build box." ]
& ipv6 "2001:4830:1600:187::2"
+ -- No unattended upgrades as there is currently no console access.
+ -- (Also, system is not currently running a stock kernel,
+ -- although it should be able to.)
& Postfix.satellite
+ & Apt.serviceInstalledRunning "ntp"
+ & Apt.serviceInstalledRunning "aiccu"
+
+ -- Using unstable to get new enough ghc for TH on arm.
+ & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer
+ (System (Debian Unstable) "armel") (Cron.Daily) "22h")
-- This is not a complete description of kite, since it's a
-- multiuser system with eg, user passwords that are not deployed
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index 86bf104c..6b73bee9 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -94,19 +94,19 @@ cabalDeps = flagFile go cabalupdated
go = userScriptProperty (User builduser) ["cabal update && cabal install git-annex --only-dependencies || true"]
cabalupdated = homedir </> ".cabal" </> "packages" </> "hackage.haskell.org" </> "00-index.cache"
-standardAutoBuilderContainer :: Architecture -> Int -> TimeOut -> Systemd.Container
-standardAutoBuilderContainer arch buildminute timeout = Systemd.container name bootstrap
- & os osver
- & Apt.stdSourcesList
- & Apt.unattendedUpgrades
- & User.accountFor (User builduser)
- & tree arch
- & buildDepsApt
- & autobuilder arch (Cron.Times $ show buildminute ++ " * * * *") timeout
+standardAutoBuilderContainer :: System -> Times -> TimeOut -> Systemd.Container
+standardAutoBuilderContainer osver@(System _ arch) crontime timeout =
+ Systemd.container name bootstrap
+ & os osver
+ & Apt.stdSourcesList
+ & Apt.unattendedUpgrades
+ & User.accountFor (User builduser)
+ & tree arch
+ & buildDepsApt
+ & autobuilder arch crontime timeout
where
name = arch ++ "-git-annex-builder"
bootstrap = Chroot.debootstrapped osver mempty
- osver = System (Debian Testing) arch
androidAutoBuilderContainer :: Times -> TimeOut -> Systemd.Container
androidAutoBuilderContainer crontimes timeout =