cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-05-20 18:49:03 -04:00
parent e78d357dbe
commit 8f9ab315e6
Failed to extract signature
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config-joey.hs
View File

@ -199,7 +199,6 @@ hosts = -- (o) `
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
-- This volume is shared with the armel builder. -- This volume is shared with the armel builder.
& Docker.volume GitAnnexBuilder.homedir & Docker.volume GitAnnexBuilder.homedir
& File.ownerGroup GitAnnexBuilder.homedir GitAnnexBuilder.builduser GitAnnexBuilder.builduser
-- Install current versions of build deps from cabal. -- Install current versions of build deps from cabal.
& GitAnnexBuilder.tree "armel" & GitAnnexBuilder.tree "armel"
& GitAnnexBuilder.buildDepsNoHaskellLibs & GitAnnexBuilder.buildDepsNoHaskellLibs

3
src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
View File

@ -4,6 +4,7 @@ import Propellor
import qualified Propellor.Property.Apt as Apt import qualified Propellor.Property.Apt as Apt
import qualified Propellor.Property.User as User import qualified Propellor.Property.User as User
import qualified Propellor.Property.Cron as Cron import qualified Propellor.Property.Cron as Cron
import qualified Propellor.Property.File as File
import Propellor.Property.Cron (CronTimes) import Propellor.Property.Cron (CronTimes)
builduser :: UserName builduser :: UserName
@ -52,6 +53,8 @@ builder' buildepsprop buildarch crontimes timeout rsyncupload = combinePropertie
tree :: Architecture -> Property tree :: Architecture -> Property
tree buildarch = combineProperties "gitannexbuilder tree" tree buildarch = combineProperties "gitannexbuilder tree"
[ User.accountFor builduser [ User.accountFor builduser
-- Home directory already exists when docker volume is used.
, File.ownerGroup homedir builduser builduser
, Apt.installed ["git"] , Apt.installed ["git"]
, check (not <$> doesDirectoryExist gitbuilderdir) $ userScriptProperty builduser , check (not <$> doesDirectoryExist gitbuilderdir) $ userScriptProperty builduser
[ "git clone git://git.kitenet.net/gitannexbuilder " ++ gitbuilderdir [ "git clone git://git.kitenet.net/gitannexbuilder " ++ gitbuilderdir