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 18:18:33 -04:00
parent 2795464abf
commit 355dd5b3ca
Failed to extract signature
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config-joey.hs
View File

@ -102,14 +102,13 @@ clam = standardSystem "clam.kitenet.net" Unstable "amd64"
& Docker.configured & Docker.configured
& Docker.garbageCollected `period` Daily & Docker.garbageCollected `period` Daily
! Docker.docked webserver' ! Docker.docked oldusenetShellBox'
& Systemd.nspawned webserver
& File.dirExists "/var/www/html" & File.dirExists "/var/www/html"
& File.notPresent "/var/www/index.html" & File.notPresent "/var/www/index.html"
& "/var/www/html/index.html" `File.hasContent` ["hello, world"] & "/var/www/html/index.html" `File.hasContent` ["hello, world"]
& alias "helloworld.kitenet.net" & alias "helloworld.kitenet.net"
& Docker.docked oldusenetShellBox
& Systemd.nspawned webserver
& JoeySites.scrollBox & JoeySites.scrollBox
& alias "scroll.joeyh.name" & alias "scroll.joeyh.name"
@ -310,7 +309,7 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64"
& myDnsSecondary & myDnsSecondary
& Docker.configured & Docker.configured
& Docker.docked oldusenetShellBox ! Docker.docked oldusenetShellBox'
& Docker.docked openidProvider & Docker.docked openidProvider
`requires` Apt.serviceInstalledRunning "ntp" `requires` Apt.serviceInstalledRunning "ntp"
& Docker.docked ancientKitenet & Docker.docked ancientKitenet
@ -412,12 +411,6 @@ webserver = standardStableContainer "webserver"
& Systemd.bind "/var/www" & Systemd.bind "/var/www"
& Apt.serviceInstalledRunning "apache2" & Apt.serviceInstalledRunning "apache2"
webserver' :: Docker.Container
webserver' = standardStableDockerContainer "webserver"
& Docker.publish "80:80"
& Docker.volume "/var/www:/var/www"
& Apt.serviceInstalledRunning "apache2"
-- My own openid provider. Uses php, so containerized for security -- My own openid provider. Uses php, so containerized for security
-- and administrative sanity. -- and administrative sanity.
openidProvider :: Docker.Container openidProvider :: Docker.Container
@ -436,8 +429,13 @@ ancientKitenet = standardStableDockerContainer "ancient-kitenet"
& Git.cloned (User "root") "git://kitenet-net.branchable.com/" "/var/www" & Git.cloned (User "root") "git://kitenet-net.branchable.com/" "/var/www"
(Just "remotes/origin/old-kitenet.net") (Just "remotes/origin/old-kitenet.net")
oldusenetShellBox :: Docker.Container oldusenetShellBox :: Systemd.Container
oldusenetShellBox = standardStableDockerContainer "oldusenet-shellbox" oldusenetShellBox = standardStableContainer "oldusenet-shellbox"
& alias "shell.olduse.net"
& JoeySites.oldUseNetShellBox
oldusenetShellBox' :: Docker.Container
oldusenetShellBox' = standardStableDockerContainer "oldusenet-shellbox"
& alias "shell.olduse.net" & alias "shell.olduse.net"
& Docker.publish "4200:4200" & Docker.publish "4200:4200"
& JoeySites.oldUseNetShellBox & JoeySites.oldUseNetShellBox