propellor spin
This commit is contained in:
parent
70500b9e76
commit
d08e4a3873
|
@ -308,7 +308,6 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64"
|
||||||
& myDnsSecondary
|
& myDnsSecondary
|
||||||
|
|
||||||
& Docker.configured
|
& Docker.configured
|
||||||
! Docker.docked oldusenetShellBox'
|
|
||||||
& Docker.docked openidProvider
|
& Docker.docked openidProvider
|
||||||
`requires` Apt.serviceInstalledRunning "ntp"
|
`requires` Apt.serviceInstalledRunning "ntp"
|
||||||
& Docker.docked ancientKitenet
|
& Docker.docked ancientKitenet
|
||||||
|
@ -324,7 +323,8 @@ 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
|
! Docker.docked 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
|
||||||
-- block 22.
|
-- block 22.
|
||||||
|
@ -435,12 +435,6 @@ oldusenetShellBox = standardStableContainer "oldusenet-shellbox"
|
||||||
& alias "shell.olduse.net"
|
& alias "shell.olduse.net"
|
||||||
& JoeySites.oldUseNetShellBox
|
& JoeySites.oldUseNetShellBox
|
||||||
|
|
||||||
oldusenetShellBox' :: Docker.Container
|
|
||||||
oldusenetShellBox' = standardStableDockerContainer "oldusenet-shellbox"
|
|
||||||
& alias "shell.olduse.net"
|
|
||||||
& Docker.publish "4200:4200"
|
|
||||||
& JoeySites.oldUseNetShellBox
|
|
||||||
|
|
||||||
jerryPlay :: Docker.Container
|
jerryPlay :: Docker.Container
|
||||||
jerryPlay = standardDockerContainer "jerryplay" Unstable "amd64"
|
jerryPlay = standardDockerContainer "jerryplay" Unstable "amd64"
|
||||||
& alias "jerryplay.kitenet.net"
|
& alias "jerryplay.kitenet.net"
|
||||||
|
@ -450,8 +444,12 @@ jerryPlay = standardDockerContainer "jerryplay" Unstable "amd64"
|
||||||
& User.hasSomePassword (User "root")
|
& User.hasSomePassword (User "root")
|
||||||
& Ssh.permitRootLogin True
|
& Ssh.permitRootLogin True
|
||||||
|
|
||||||
kiteShellBox :: Docker.Container
|
kiteShellBox :: Systemd.Container
|
||||||
kiteShellBox = standardStableDockerContainer "kiteshellbox"
|
kiteShellBox = standardStableContainer "kiteshellbox"
|
||||||
|
& JoeySites.kiteShellBox
|
||||||
|
|
||||||
|
kiteShellBox' :: Docker.Container
|
||||||
|
kiteShellBox' = standardStableDockerContainer "kiteshellbox"
|
||||||
& JoeySites.kiteShellBox
|
& JoeySites.kiteShellBox
|
||||||
& Docker.publish "443:443"
|
& Docker.publish "443:443"
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue