diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-03-12 20:09:31 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-03-12 20:09:31 -0400 |
| commit | bc60edb50a41a326e64ccd25a36ac27215ef4b9e (patch) | |
| tree | 7e3849d123da0dda038d2f5e3d88025635beb444 /config-joey.hs | |
| parent | 4f101f8560e29958b08306c86a1b8ca34e8a6a0c (diff) | |
| parent | 9292cee1aa7967a0afe6d45f58a6d429d1b56b55 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/privdata.gpg
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs index f9f4eaa7..d51b7c91 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -96,6 +96,10 @@ clam = standardSystem "clam.kitenet.net" Unstable "amd64" & "/var/www/index.html" `File.hasContent` ["hello, world"] & alias "helloworld.kitenet.net" & Docker.docked oldusenetShellBox + + & JoeySites.scrollBox + & alias "scroll.joeyh.name" + & alias "us.scroll.joeyh.name" -- ssh on some extra ports to deal with horrible networks -- while travelling @@ -272,10 +276,14 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64" & Docker.docked jerryPlay & Docker.garbageCollected `period` (Weekly (Just 1)) + & JoeySites.scrollBox + & alias "scroll.joeyh.name" + & alias "eu.scroll.joeyh.name" + -- For https port 443, shellinabox with ssh login to -- kitenet.net & alias "shell.kitenet.net" - & JoeySites.kiteShellBox + & Docker.docked kiteShellBox -- Nothing is using http port 80, so listen on -- that port for ssh, for traveling on bad networks that -- block 22. @@ -348,6 +356,11 @@ jerryPlay = standardContainer "jerryplay" Unstable "amd64" & Apt.installed ["ssh"] & User.hasSomePassword "root" & Ssh.permitRootLogin True + +kiteShellBox :: Docker.Container +kiteShellBox = standardStableContainer "kiteshellbox" + & JoeySites.kiteShellBox + & Docker.publish "443:443" type Motd = [String] |