summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-12-21 21:40:26 -0400
committerJoey Hess2014-12-21 21:40:26 -0400
commit6d56dbd35ae10c3c51f14e441fd9f90a0c53c92f (patch)
tree7cd7ed5ac175282183e6466d354904420af18e16 /config-joey.hs
parenta68bd830acfa90949462189e47783a4d257739bc (diff)
parentdc36a98fc159794395512ff2ae78eb8e0acb0ea5 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 7aa94bb1..4525f22e 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -109,6 +109,7 @@ clam = standardSystem "clam.kitenet.net" Unstable "amd64"
& File.notPresent "/var/www/html/index.html"
& "/var/www/index.html" `File.hasContent` ["hello, world"]
& alias "helloworld.kitenet.net"
+ & Docker.docked oldusenetShellBox
-- ssh on some extra ports to deal with horrible networks
-- while travelling
@@ -216,6 +217,7 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
& Docker.configured
& Docker.garbageCollected `period` Daily
+ & Docker.docked oldusenetShellBox
diatom :: Host
diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"