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

workaround bug

This commit is contained in:
Joey Hess 2015-05-29 22:51:32 -04:00
parent 78fecfcba4
commit b5a8c7227b
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config-joey.hs
View File

@ -25,6 +25,7 @@ import qualified Propellor.Property.Obnam as Obnam
import qualified Propellor.Property.Gpg as Gpg import qualified Propellor.Property.Gpg as Gpg
import qualified Propellor.Property.Systemd as Systemd import qualified Propellor.Property.Systemd as Systemd
import qualified Propellor.Property.Journald as Journald import qualified Propellor.Property.Journald as Journald
import qualified Propellor.Property.Chroot as Chroot
import qualified Propellor.Property.OS as OS import qualified Propellor.Property.OS as OS
import qualified Propellor.Property.HostingProvider.CloudAtCost as CloudAtCost import qualified Propellor.Property.HostingProvider.CloudAtCost as CloudAtCost
import qualified Propellor.Property.HostingProvider.Linode as Linode import qualified Propellor.Property.HostingProvider.Linode as Linode
@ -153,9 +154,15 @@ honeybee = standardSystem "honeybee.kitenet.net" Testing "armhf"
& Apt.serviceInstalledRunning "ntp" & Apt.serviceInstalledRunning "ntp"
& Apt.serviceInstalledRunning "aiccu" & Apt.serviceInstalledRunning "aiccu"
-- Not using systemd-nspawn because it's broken (kernel issue?)
-- & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer
-- osver Cron.Daily "22h")
& Chroot.provisioned
(Chroot.debootstrapped builderos mempty "/var/lib/containers/armel-git-annex-builder"
& GitAnnexBuilder.standardAutoBuilder builderos Cron.Daily "22h")
where
-- Using unstable to get new enough ghc for TH on arm. -- Using unstable to get new enough ghc for TH on arm.
& Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer builderos = System (Debian Unstable) "armel"
(System (Debian Unstable) "armel") (Cron.Daily) "22h")
-- This is not a complete description of kite, since it's a -- This is not a complete description of kite, since it's a
-- multiuser system with eg, user passwords that are not deployed -- multiuser system with eg, user passwords that are not deployed

11
src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
View File

@ -97,6 +97,14 @@ cabalDeps = flagFile go cabalupdated
standardAutoBuilderContainer :: System -> Times -> TimeOut -> Systemd.Container standardAutoBuilderContainer :: System -> Times -> TimeOut -> Systemd.Container
standardAutoBuilderContainer osver@(System _ arch) crontime timeout = standardAutoBuilderContainer osver@(System _ arch) crontime timeout =
Systemd.container name bootstrap Systemd.container name bootstrap
& standardAutoBuilder osver crontime timeout
where
name = arch ++ "-git-annex-builder"
bootstrap = Chroot.debootstrapped osver mempty
standardAutoBuilder :: System -> Times -> TimeOut -> Property HasInfo
standardAutoBuilder osver@(System _ arch) crontime timeout =
propertyList "git-annex-builder" $ props
& os osver & os osver
& Apt.stdSourcesList & Apt.stdSourcesList
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
@ -104,9 +112,6 @@ standardAutoBuilderContainer osver@(System _ arch) crontime timeout =
& tree arch & tree arch
& buildDepsApt & buildDepsApt
& autobuilder arch crontime timeout & autobuilder arch crontime timeout
where
name = arch ++ "-git-annex-builder"
bootstrap = Chroot.debootstrapped osver mempty
androidAutoBuilderContainer :: Times -> TimeOut -> Systemd.Container androidAutoBuilderContainer :: Times -> TimeOut -> Systemd.Container
androidAutoBuilderContainer crontimes timeout = androidAutoBuilderContainer crontimes timeout =