From 8f9ab315e6460166eab17c414ddf0a581dc1250b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 May 2014 18:49:03 -0400
Subject: [PATCH] propellor spin

---
 config-joey.hs                                         | 1 -
 src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config-joey.hs b/config-joey.hs
index 10e19a0..9972d5d 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -199,7 +199,6 @@ hosts =               --                  (o)  `
 		& Apt.unattendedUpgrades
 		-- This volume is shared with the armel builder.
 		& Docker.volume GitAnnexBuilder.homedir
-		& File.ownerGroup GitAnnexBuilder.homedir GitAnnexBuilder.builduser GitAnnexBuilder.builduser
 		-- Install current versions of build deps from cabal.
 		& GitAnnexBuilder.tree "armel"
 		& GitAnnexBuilder.buildDepsNoHaskellLibs
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index 1dbdbca..0cd5d3c 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -4,6 +4,7 @@ import Propellor
 import qualified Propellor.Property.Apt as Apt
 import qualified Propellor.Property.User as User
 import qualified Propellor.Property.Cron as Cron
+import qualified Propellor.Property.File as File
 import Propellor.Property.Cron (CronTimes)
 
 builduser :: UserName
@@ -52,6 +53,8 @@ builder' buildepsprop buildarch crontimes timeout rsyncupload = combinePropertie
 tree :: Architecture -> Property
 tree buildarch = combineProperties "gitannexbuilder tree"
 	[ User.accountFor builduser
+	-- Home directory already exists when docker volume is used.
+	, File.ownerGroup homedir builduser builduser
 	, Apt.installed ["git"]
 	, check (not <$> doesDirectoryExist gitbuilderdir) $ userScriptProperty builduser
 		[ "git clone git://git.kitenet.net/gitannexbuilder " ++ gitbuilderdir