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

propellor spin

This commit is contained in:
Joey Hess 2015-06-01 19:31:11 -04:00
parent 70500b9e76
commit d08e4a3873
Failed to extract signature
2 changed files with 1431 additions and 1433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config-joey.hs
View File

@ -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"
@ -449,9 +443,13 @@ jerryPlay = standardDockerContainer "jerryplay" Unstable "amd64"
& Apt.installed ["ssh"] & Apt.installed ["ssh"]
& User.hasSomePassword (User "root") & User.hasSomePassword (User "root")
& Ssh.permitRootLogin True & Ssh.permitRootLogin True
kiteShellBox :: Systemd.Container
kiteShellBox = standardStableContainer "kiteshellbox"
& JoeySites.kiteShellBox
kiteShellBox :: Docker.Container kiteShellBox' :: Docker.Container
kiteShellBox = standardStableDockerContainer "kiteshellbox" kiteShellBox' = standardStableDockerContainer "kiteshellbox"
& JoeySites.kiteShellBox & JoeySites.kiteShellBox
& Docker.publish "443:443" & Docker.publish "443:443"

2846
privdata.joey/privdata.gpg
View File

File diff suppressed because it is too large Load Diff