summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
diff options
context:
space:
mode:
authorJoey Hess2015-05-29 22:51:32 -0400
committerJoey Hess2015-05-29 22:51:47 -0400
commitb5a8c7227b15bb4c821221c6f4c3ca8fd1e1a062 (patch)
treeace8d32fe4b793fa1b76f520ee36279368243ad0 /src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
parent78fecfcba47901c6c3ff5087cc091d802c5c99d2 (diff)
workaround bug
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs')
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs11
1 files changed, 8 insertions, 3 deletions
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 =