From 580054591c1bfd4207e53e5df449979674d684a0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 3 Oct 2018 14:19:24 -0400 Subject: propellor spin --- joeyconfig.hs | 2 +- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/joeyconfig.hs b/joeyconfig.hs index 15f0aeb4..76646829 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -207,7 +207,7 @@ honeybee = host "honeybee.kitenet.net" $ props & Postfix.satellite & check (not <$> inChroot) (setupRevertableProperty autobuilder) - & check (not <$> inChroot) (undoRevertableProperty ancientautobuilder) + & check (not <$> inChroot) (setupRevertableProperty ancientautobuilder) -- In case compiler needs more than available ram & Apt.serviceInstalledRunning "swapspace" where diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index bf2741c1..ab51b7ea 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -151,7 +151,7 @@ stackInstalled = withOS "stack installed" $ \w o -> 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-" ++ archname, "-O", tmptar] + & cmdProperty "wget" [url, "-O", tmptar] `assume` MadeChange & File.dirExists tmpdir & cmdProperty "tar" ["xf", tmptar, "-C", tmpdir, "--strip-components=1"] @@ -161,14 +161,12 @@ stackInstalled = withOS "stack installed" $ \w o -> & 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" + url = case arch of + X86_32 -> "https://www.stackage.org/stack/linux-i386" + X86_64 -> "https://www.stackage.org/stack/linux-x86_64" + ARMEL -> "https://github.com/commercialhaskell/stack/releases/download/v1.7.1/stack-1.7.1-linux-arm.tar.gz" -- Probably not available. - a -> architectureToDebianArchString a + a -> "https://www.stackage.org/stack/linux-" ++ architectureToDebianArchString a binstack = "/usr/bin/stack" tmptar = "/root/stack.tar.gz" tmpdir = "/root/stack" -- cgit v1.2.3