summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-02-20 13:49:18 -0400
committerJoey Hess2017-02-20 13:49:18 -0400
commitaedf8c5fc5a11b12458b67e5245bec25195c9233 (patch)
tree2db578cb54faaf3fbe8b077014eb6bc44d3967f4
parentd5ba3f8e45cc538549121f01766955ede59e1e48 (diff)
parentf515da36f5adbe28875674fdf92a9f015376e3f4 (diff)
Merge branch 'joeyconfig'
l---------config.hs2
-rw-r--r--joeyconfig.hs7
-rw-r--r--privdata/relocate1
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs15
4 files changed, 20 insertions, 5 deletions
diff --git a/config.hs b/config.hs
index ec313725..97d90636 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-config-simple.hs \ No newline at end of file
+joeyconfig.hs \ No newline at end of file
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 7d2ea8b2..e9e47179 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -251,7 +251,12 @@ honeybee = host "honeybee.kitenet.net" $ props
& Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer
GitAnnexBuilder.armAutoBuilder
- Unstable ARMEL Nothing Cron.Daily "22h")
+ Unstable ARMEL Nothing
+ (Cron.Times "15 6 * * *") "22h")
+ & Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer
+ GitAnnexBuilder.stackAutoBuilder
+ (Stable "jessie") ARMEL (Just "ancient")
+ (Cron.Times "15 18 * * *") "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/privdata/relocate b/privdata/relocate
new file mode 100644
index 00000000..271692d8
--- /dev/null
+++ b/privdata/relocate
@@ -0,0 +1 @@
+.joeyconfig
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index d40964b3..bd4d0928 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -143,15 +143,15 @@ stackAutoBuilder suite arch flavor =
stackInstalled :: Property Linux
stackInstalled = withOS "stack installed" $ \w o ->
case o of
- (Just (System (Debian Linux (Stable "jessie")) X86_32)) ->
- ensureProperty w $ manualinstall X86_32
+ (Just (System (Debian Linux (Stable "jessie")) arch)) ->
+ ensureProperty w $ manualinstall arch
_ -> ensureProperty w $ Apt.installed ["haskell-stack"]
where
-- Warning: Using a binary downloaded w/o validation.
manualinstall :: Architecture -> Property Linux
manualinstall arch = tightenTargets $ check (not <$> doesFileExist binstack) $
propertyList "stack installed from upstream tarball" $ props
- & cmdProperty "wget" ["https://www.stackage.org/stack/linux-" ++ architectureToDebianArchString arch, "-O", tmptar]
+ & cmdProperty "wget" ["https://www.stackage.org/stack/linux-" ++ archname, "-O", tmptar]
`assume` MadeChange
& File.dirExists tmpdir
& cmdProperty "tar" ["xf", tmptar, "-C", tmpdir, "--strip-components=1"]
@@ -160,6 +160,15 @@ stackInstalled = withOS "stack installed" $ \w o ->
`assume` MadeChange
& cmdProperty "rm" ["-rf", tmpdir, tmptar]
`assume` MadeChange
+ where
+ -- See https://www.stackage.org/stack/ for the list of
+ -- binaries.
+ archname = case arch of
+ X86_32 -> "i386"
+ X86_64 -> "x86_64"
+ ARMHF -> "arm"
+ -- Probably not available.
+ a -> architectureToDebianArchString a
binstack = "/usr/bin/stack"
tmptar = "/root/stack.tar.gz"
tmpdir = "/root/stack"