From 90097577ae130ed7fb78ae8b347c66e91f95b581 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 3 Apr 2014 17:12:03 -0400 Subject: [PATCH 1/2] propellor spin --- config-joeyh.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-joeyh.hs b/config-joeyh.hs index 6868d48..cfe67e0 100644 --- a/config-joeyh.hs +++ b/config-joeyh.hs @@ -47,7 +47,7 @@ host hostname@"orca.kitenet.net" = standardSystem Unstable $ props & Docker.configured & Apt.buildDep ["git-annex"] & Docker.docked container hostname "amd64-git-annex-builder" - ! Docker.docked container hostname "i386-git-annex-builder" + & Docker.docked container hostname "i386-git-annex-builder" & Docker.garbageCollected -- My laptop host _hostname@"darkstar.kitenet.net" = Just $ props From 4996f12326207bc61c025c8717dfeb17269367c2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 3 Apr 2014 17:30:15 -0400 Subject: [PATCH 2/2] update --- config-joeyh.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/config-joeyh.hs b/config-joeyh.hs index cfe67e0..cb56f4b 100644 --- a/config-joeyh.hs +++ b/config-joeyh.hs @@ -36,8 +36,6 @@ host hostname@"clam.kitenet.net" = standardSystem Unstable $ props & Tor.isBridge & JoeySites.oldUseNetshellBox & Docker.configured - & File.dirExists "/var/www" - ! Docker.docked container hostname "webserver" ! Docker.docked container hostname "amd64-git-annex-builder" & Docker.garbageCollected -- Orca is the main git-annex build box. @@ -47,7 +45,7 @@ host hostname@"orca.kitenet.net" = standardSystem Unstable $ props & Docker.configured & Apt.buildDep ["git-annex"] & Docker.docked container hostname "amd64-git-annex-builder" - & Docker.docked container hostname "i386-git-annex-builder" + ! Docker.docked container hostname "i386-git-annex-builder" & Docker.garbageCollected -- My laptop host _hostname@"darkstar.kitenet.net" = Just $ props