From 4f239d1360c87b069279ce1b100db4a057f94e48 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 May 2014 10:46:25 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs') 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" + ] -- cgit v1.2.3