From b8d1b39d9f82df6290f5585c4dcebff55e286536 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 14 Feb 2017 14:23:23 -0400
Subject: propellor spin

---
 joeyconfig.hs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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
-- 
cgit v1.3-2-g0d8e

-- 
cgit v1.3-2-g0d8e


From a55aea985f7d461c34f75cc1b933569122cb742f Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 15 Feb 2017 15:22:14 -0400
Subject: setting up joeyconfig after merge

---
 config.hs         | 2 +-
 privdata/relocate | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 privdata/relocate

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/privdata/relocate b/privdata/relocate
new file mode 100644
index 00000000..271692d8
--- /dev/null
+++ b/privdata/relocate
@@ -0,0 +1 @@
+.joeyconfig
-- 
cgit v1.3-2-g0d8e


From f515da36f5adbe28875674fdf92a9f015376e3f4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 15 Feb 2017 15:22:17 -0400
Subject: more arches for stackInstalled

There is no armel build, unfortunately; the "arm" build is armhf at
least currently.
---
 src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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"
-- 
cgit v1.3-2-g0d8e