summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-05-21 12:58:53 -0400
committerJoey Hess2014-05-21 12:58:53 -0400
commit7ac991635c0dbdb2ace19480fcac22dae36e5409 (patch)
treecb414b74431f517ee18eaa63e5f727a5e7c52399 /config-joey.hs
parenteeb2d688bdf435158929bb3cbfea6fb68076de9e (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/config-joey.hs b/config-joey.hs
index f495004e..386e5900 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -94,8 +94,8 @@ hosts = -- (o) `
& Docker.configured
& Docker.docked hosts "amd64-git-annex-builder"
& Docker.docked hosts "i386-git-annex-builder"
- & Docker.docked hosts "armel-git-annex-builder-companion"
- & Docker.docked hosts "armel-git-annex-builder"
+ ! Docker.docked hosts "armel-git-annex-builder-companion"
+ ! Docker.docked hosts "armel-git-annex-builder"
& Docker.garbageCollected `period` Daily
& Apt.buildDep ["git-annex"] `period` Daily
@@ -199,7 +199,7 @@ hosts = -- (o) `
& Apt.stdSourcesList Unstable
& Apt.unattendedUpgrades
-- This volume is shared with the armel builder.
- & Docker.volume GitAnnexBuilder.homedir
+ & Docker.volume GitAnnexBuilder.gitbuilderdir
-- Install current versions of build deps from cabal.
& GitAnnexBuilder.tree "armel"
& GitAnnexBuilder.buildDepsNoHaskellLibs
@@ -208,8 +208,7 @@ hosts = -- (o) `
-- using $COMPANION_PORT_22_TCP_ADDR as the hostname,
& Docker.expose "22"
& Apt.serviceInstalledRunning "ssh"
- -- ssh key is shared via the home directory volume
- & GitAnnexBuilder.sshKeyGen
+ & Ssh.authorizedKeys GitAnnexBuilder.builduser
, Docker.container "armel-git-annex-builder"
(image $ System (Debian Unstable) "armel")
& Apt.stdSourcesList Unstable
@@ -217,6 +216,7 @@ hosts = -- (o) `
& Apt.installed ["openssh-client"]
& Docker.link "armel-git-annex-builder-companion" "companion"
& Docker.volumes_from "armel-git-annex-builder-companion"
+ & Ssh.keyImported SshRsa GitAnnexBuilder.builduser
-- TODO: automate installing haskell libs
-- (Currently have to run
-- git-annex/standalone/linux/install-haskell-packages