diff options
| author | Joey Hess <joey@kitenet.net> | 2014-05-20 18:49:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-20 18:49:03 -0400 |
| commit | 8f9ab315e6460166eab17c414ddf0a581dc1250b (patch) | |
| tree | c50c0db2ccf93d255d6a36d303d77f6c366a3b0c | |
| parent | e78d357dbe164269b5f41b26f651b7d3ae234a50 (diff) | |
propellor spin
| -rw-r--r-- | config-joey.hs | 1 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs index 10e19a0b..9972d5db 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 1dbdbca7..0cd5d3c5 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 |