summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2015-06-01 19:47:30 -0400
committerJoey Hess2015-06-01 19:47:30 -0400
commitde4fa910ee58391fb35855a2fec574d4d6e36a74 (patch)
tree52d215633e18ae028a4161290b5dbaf6d3f884c6 /config-joey.hs
parent2f964eafcb054ba15a7da4ed01fa5e018157320d (diff)
cleanup
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs8
1 files changed, 1 insertions, 7 deletions
diff --git a/config-joey.hs b/config-joey.hs
index c94d5d5d..dec2701b 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -323,7 +323,6 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64"
-- For https port 443, shellinabox with ssh login to
-- kitenet.net
& alias "shell.kitenet.net"
- ! Docker.docked kiteShellBox'
& Systemd.nspawned kiteShellBox
-- Nothing is using http port 80, so listen on
-- that port for ssh, for traveling on bad networks that
@@ -427,7 +426,7 @@ ancientKitenet = standardStableDockerContainer "ancient-kitenet"
& alias "ancient.kitenet.net"
& Docker.publish "1994:80"
& Apt.serviceInstalledRunning "apache2"
- & Git.cloned (User "root") "git://kitenet-net.branchable.com/" "/var/www"
+ & Git.cloned (User "root") "git://kitenet-net.branchable.com/" "/var/www/html"
(Just "remotes/origin/old-kitenet.net")
oldusenetShellBox :: Systemd.Container
@@ -447,11 +446,6 @@ jerryPlay = standardDockerContainer "jerryplay" Unstable "amd64"
kiteShellBox :: Systemd.Container
kiteShellBox = standardStableContainer "kiteshellbox"
& JoeySites.kiteShellBox
-
-kiteShellBox' :: Docker.Container
-kiteShellBox' = standardStableDockerContainer "kiteshellbox"
- & JoeySites.kiteShellBox
- & Docker.publish "443:443"
type Motd = [String]