summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-05-29 22:51:32 -0400
committerJoey Hess2015-05-29 22:51:47 -0400
commitb5a8c7227b15bb4c821221c6f4c3ca8fd1e1a062 (patch)
treeace8d32fe4b793fa1b76f520ee36279368243ad0
parent78fecfcba47901c6c3ff5087cc091d802c5c99d2 (diff)
workaround bug
-rw-r--r--config-joey.hs11
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs11
2 files changed, 17 insertions, 5 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 92a6c318..510fd8da 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -25,6 +25,7 @@ import qualified Propellor.Property.Obnam as Obnam
import qualified Propellor.Property.Gpg as Gpg
import qualified Propellor.Property.Systemd as Systemd
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.HostingProvider.CloudAtCost as CloudAtCost
import qualified Propellor.Property.HostingProvider.Linode as Linode
@@ -153,9 +154,15 @@ honeybee = standardSystem "honeybee.kitenet.net" Testing "armhf"
& Apt.serviceInstalledRunning "ntp"
& 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.
- & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer
- (System (Debian Unstable) "armel") (Cron.Daily) "22h")
+ builderos = System (Debian Unstable) "armel"
-- 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 6b73bee9..3c638721 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -97,6 +97,14 @@ cabalDeps = flagFile go cabalupdated
standardAutoBuilderContainer :: System -> Times -> TimeOut -> Systemd.Container
standardAutoBuilderContainer osver@(System _ arch) crontime timeout =
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
& Apt.stdSourcesList
& Apt.unattendedUpgrades
@@ -104,9 +112,6 @@ standardAutoBuilderContainer osver@(System _ arch) crontime timeout =
& tree arch
& buildDepsApt
& autobuilder arch crontime timeout
- where
- name = arch ++ "-git-annex-builder"
- bootstrap = Chroot.debootstrapped osver mempty
androidAutoBuilderContainer :: Times -> TimeOut -> Systemd.Container
androidAutoBuilderContainer crontimes timeout =