summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-05-31 13:44:28 -0400
committerJoey Hess2014-05-31 13:44:28 -0400
commit2d740c92c9c392d7799d51140bf8691588fd68df (patch)
tree81dd1ba6134c27be98964be25dba9aa1f3a46eee /config-joey.hs
parent9836bdf4c96eba09fbe4649e32240682566d4887 (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs8
1 files changed, 7 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 44e25338..b14e06fd 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -42,6 +42,8 @@ hosts = -- (o) `
& Docker.docked hosts "android-git-annex"
-- Nothing super-important lives here.
+ -- Any services I care about are containerized so they can easily
+ -- be moved.
, standardSystem "clam.kitenet.net" Unstable "amd64"
& ipv4 "162.248.143.249"
& ipv6 "2002:5044:5531::1"
@@ -54,7 +56,7 @@ hosts = -- (o) `
& Docker.configured
& alias "shell.olduse.net"
- & JoeySites.oldUseNetShellBox
+ & Docker.docked hosts "oldusenet-shellbox"
& alias "openid.kitenet.net"
& Docker.docked hosts "openid-provider"
@@ -191,6 +193,10 @@ hosts = -- (o) `
& Git.cloned "root" "git://kitenet-net.branchable.com/" "/var/www"
(Just "remotes/origin/old-kitenet.net")
+ , standardContainer "oldusenet-shellbox" Stable "amd64"
+ & Docker.publish "4200:4200"
+ & JoeySites.oldUseNetShellBox
+
-- git-annex autobuilder containers
, GitAnnexBuilder.standardAutoBuilderContainer dockerImage "amd64" 15 "2h"
, GitAnnexBuilder.standardAutoBuilderContainer dockerImage "i386" 45 "2h"