summaryrefslogtreecommitdiff
path: root/joeyconfig.hs
diff options
context:
space:
mode:
authorJoey Hess2017-11-17 19:18:39 -0400
committerJoey Hess2017-11-17 19:20:02 -0400
commit15073fd5fc812941e2ab2d39d5950106fb3b7a98 (patch)
tree67cd99ea5be81eda68410417c8367e2b934249df /joeyconfig.hs
parent5befa31942af20df03fa1d061de1cd05db0996f2 (diff)
fixed for bootstrapping honeybee from chroot
Install dnsmasq first to avoid connfile conflict Don't set up container when in chroot, won't work. Propellor should perhaps prevent this..
Diffstat (limited to 'joeyconfig.hs')
-rw-r--r--joeyconfig.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index f241cf3c..e1046081 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -203,11 +203,13 @@ honeybee = host "honeybee.kitenet.net" $ props
& Apt.installed ["mtr-tiny", "iftop", "screen"]
& Postfix.satellite
- & Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer
- GitAnnexBuilder.armAutoBuilder
- Unstable ARMEL Nothing (Cron.Times "15 10 * * *") "10h")
+ & check (not <$> inChroot) (setupRevertableProperty autobuilder)
-- In case compiler needs more than available ram
& Apt.serviceInstalledRunning "swapspace"
+ where
+ autobuilder = Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer
+ GitAnnexBuilder.armAutoBuilder
+ Unstable ARMEL Nothing (Cron.Times "15 10 * * *") "10h")
-- This is not a complete description of kite, since it's a
-- multiuser system with eg, user passwords that are not deployed