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

propellor spin

This commit is contained in:
Joey Hess 2014-05-23 10:46:25 -04:00
parent 424ba1229b
commit 4f239d1360
Failed to extract signature
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,8 +117,7 @@ armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-
& tree "armel" & tree "armel"
& buildDepsNoHaskellLibs & buildDepsNoHaskellLibs
& cabalDeps & cabalDeps
-- The armel builder can ssh to this companion, -- The armel builder can ssh to this companion.
-- using $COMPANION_PORT_22_TCP_ADDR as the hostname,
& Docker.expose "22" & Docker.expose "22"
& Apt.serviceInstalledRunning "ssh" & Apt.serviceInstalledRunning "ssh"
& Ssh.authorizedKeys builduser & Ssh.authorizedKeys builduser
@ -137,3 +136,8 @@ armelContainer dockerImage crontimes timeout = Docker.container "armel-git-annex
-- which is not fully automated.) -- which is not fully automated.)
& builder' buildDepsNoHaskellLibs "armel" crontimes timeout True & builder' buildDepsNoHaskellLibs "armel" crontimes timeout True
& Ssh.keyImported SshRsa builduser & Ssh.keyImported SshRsa builduser
& trivial writecompanionaddress
where
writecompanionaddress = scriptProperty
[ "echo \"$COMPANION_PORT_22_TCP_ADDR\" > " ++ homedir </> "companion_address"
]