cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup

This commit is contained in:
Joey Hess 2015-06-01 19:47:30 -04:00
parent 2f964eafcb
commit de4fa910ee
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config-joey.hs
View File

@ -323,7 +323,6 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64"
-- For https port 443, shellinabox with ssh login to -- For https port 443, shellinabox with ssh login to
-- kitenet.net -- kitenet.net
& alias "shell.kitenet.net" & alias "shell.kitenet.net"
! Docker.docked kiteShellBox'
& Systemd.nspawned kiteShellBox & Systemd.nspawned kiteShellBox
-- Nothing is using http port 80, so listen on -- Nothing is using http port 80, so listen on
-- that port for ssh, for traveling on bad networks that -- that port for ssh, for traveling on bad networks that
@ -427,7 +426,7 @@ ancientKitenet = standardStableDockerContainer "ancient-kitenet"
& alias "ancient.kitenet.net" & alias "ancient.kitenet.net"
& Docker.publish "1994:80" & Docker.publish "1994:80"
& Apt.serviceInstalledRunning "apache2" & 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") (Just "remotes/origin/old-kitenet.net")
oldusenetShellBox :: Systemd.Container oldusenetShellBox :: Systemd.Container
@ -448,11 +447,6 @@ kiteShellBox :: Systemd.Container
kiteShellBox = standardStableContainer "kiteshellbox" kiteShellBox = standardStableContainer "kiteshellbox"
& JoeySites.kiteShellBox & JoeySites.kiteShellBox
kiteShellBox' :: Docker.Container
kiteShellBox' = standardStableDockerContainer "kiteshellbox"
& JoeySites.kiteShellBox
& Docker.publish "443:443"
type Motd = [String] type Motd = [String]
-- This is my standard system setup. -- This is my standard system setup.