diff options
| author | Joey Hess <joey@kitenet.net> | 2014-05-23 10:46:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-23 10:46:25 -0400 |
| commit | 4f239d1360c87b069279ce1b100db4a057f94e48 (patch) | |
| tree | 5ada963f95f8bc137289b2466b27bfcb18a15ab7 /src | |
| parent | 424ba1229ba0a786d6090d69739defe47d0612c8 (diff) | |
propellor spin
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 80877fa5..56123b60 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -117,8 +117,7 @@ armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder- & tree "armel" & buildDepsNoHaskellLibs & cabalDeps - -- The armel builder can ssh to this companion, - -- using $COMPANION_PORT_22_TCP_ADDR as the hostname, + -- The armel builder can ssh to this companion. & Docker.expose "22" & Apt.serviceInstalledRunning "ssh" & Ssh.authorizedKeys builduser @@ -137,3 +136,8 @@ armelContainer dockerImage crontimes timeout = Docker.container "armel-git-annex -- which is not fully automated.) & builder' buildDepsNoHaskellLibs "armel" crontimes timeout True & Ssh.keyImported SshRsa builduser + & trivial writecompanionaddress + where + writecompanionaddress = scriptProperty + [ "echo \"$COMPANION_PORT_22_TCP_ADDR\" > " ++ homedir </> "companion_address" + ] |