From fe10f73c0fd9dfffcbf94711f888f1ab8b7d6359 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 19:45:55 -0400 Subject: propellor spin --- config-joey.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 77e93f26..ce0ebba2 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -274,6 +274,7 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64" `requires` Apt.serviceInstalledRunning "ntp" & Docker.docked ancientKitenet & Docker.docked jerryPlay + & Docker.docked kiteShellBox & Docker.garbageCollected `period` (Weekly (Just 1)) & JoeySites.scrollBox @@ -283,7 +284,6 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64" -- For https port 443, shellinabox with ssh login to -- kitenet.net & alias "shell.kitenet.net" - & JoeySites.kiteShellBox -- Nothing is using http port 80, so listen on -- that port for ssh, for traveling on bad networks that -- block 22. @@ -356,6 +356,10 @@ jerryPlay = standardContainer "jerryplay" Unstable "amd64" & Apt.installed ["ssh"] & User.hasSomePassword "root" & Ssh.permitRootLogin True + +kiteShellBox :: Docker.Container +kiteShellBox = standardContainer "kiteshell" (Stable "wheezy") "amd64" + & JoeySites.kiteShellBox type Motd = [String] -- cgit v1.2.3