diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-06-01 19:31:11 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-06-01 19:31:11 -0400 |
| commit | d08e4a3873bb0c57a09e45884c9fece133674077 (patch) | |
| tree | 0d24e7537facff6ac17b2ba9a220468cb3a59bfc /config-joey.hs | |
| parent | 70500b9e76f493dd95eff7f73307f96e10c26707 (diff) | |
propellor spin
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/config-joey.hs b/config-joey.hs index f547ed48..c94d5d5d 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -308,7 +308,6 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64" & myDnsSecondary & Docker.configured - ! Docker.docked oldusenetShellBox' & Docker.docked openidProvider `requires` Apt.serviceInstalledRunning "ntp" & Docker.docked ancientKitenet @@ -324,7 +323,8 @@ 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 + ! 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 -- block 22. @@ -435,12 +435,6 @@ oldusenetShellBox = standardStableContainer "oldusenet-shellbox" & alias "shell.olduse.net" & JoeySites.oldUseNetShellBox -oldusenetShellBox' :: Docker.Container -oldusenetShellBox' = standardStableDockerContainer "oldusenet-shellbox" - & alias "shell.olduse.net" - & Docker.publish "4200:4200" - & JoeySites.oldUseNetShellBox - jerryPlay :: Docker.Container jerryPlay = standardDockerContainer "jerryplay" Unstable "amd64" & alias "jerryplay.kitenet.net" @@ -449,9 +443,13 @@ jerryPlay = standardDockerContainer "jerryplay" Unstable "amd64" & Apt.installed ["ssh"] & User.hasSomePassword (User "root") & Ssh.permitRootLogin True + +kiteShellBox :: Systemd.Container +kiteShellBox = standardStableContainer "kiteshellbox" + & JoeySites.kiteShellBox -kiteShellBox :: Docker.Container -kiteShellBox = standardStableDockerContainer "kiteshellbox" +kiteShellBox' :: Docker.Container +kiteShellBox' = standardStableDockerContainer "kiteshellbox" & JoeySites.kiteShellBox & Docker.publish "443:443" |