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 14:28:34 -04:00
parent 65357750d2
commit 312123e1b9
Failed to extract signature
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
config-joey.hs
View File

@ -104,13 +104,15 @@ clam = standardSystem "clam.kitenet.net" Unstable "amd64"
& Docker.configured & Docker.configured
& Docker.garbageCollected `period` Daily & Docker.garbageCollected `period` Daily
& Docker.docked webserver ! Docker.docked webserver'
& File.dirExists "/var/www/html" & File.dirExists "/var/www/html"
& File.notPresent "/var/www/html/index.html" & File.notPresent "/var/www/html/index.html"
& "/var/www/index.html" `File.hasContent` ["hello, world"] & "/var/www/index.html" `File.hasContent` ["hello, world"]
& alias "helloworld.kitenet.net" & alias "helloworld.kitenet.net"
& Docker.docked oldusenetShellBox & Docker.docked oldusenetShellBox
& Systemd.nspawned webserver
& JoeySites.scrollBox & JoeySites.scrollBox
& alias "scroll.joeyh.name" & alias "scroll.joeyh.name"
& alias "us.scroll.joeyh.name" & alias "us.scroll.joeyh.name"
@ -404,22 +406,28 @@ iabak = host "iabak.archiveteam.org"
--' __|II| ,. --' __|II| ,.
---- __|II|II|__ ( \_,/\ ---- __|II|II|__ ( \_,/\
--'-------'\o/-'-.-'-.-'-.- __|II|II|II|II|___/ __/ -'-.-'-.-'-.-'-.-'-.-'- --'-------'\o/-'-.-'-.-'-.- __|II|II|II|II|___/ __/ -'-.-'-.-'-.-'-.-'-.-'-
-------------------------- | [Docker] / -------------------------- -------------------------- | [Containers] / --------------------------
-------------------------- : / --------------------------- -------------------------- : / ---------------------------
--------------------------- \____, o ,' ---------------------------- --------------------------- \____, o ,' ----------------------------
---------------------------- '--,___________,' ----------------------------- ---------------------------- '--,___________,' -----------------------------
-- Simple web server, publishing the outside host's /var/www -- Simple web server, publishing the outside host's /var/www
webserver :: Docker.Container webserver :: Systemd.Container
webserver = standardStableContainer "webserver" webserver = standardStableContainer "webserver"
& Docker.publish "80:80" & Docker.publish "80:80"
& Docker.volume "/var/www:/var/www" & Docker.volume "/var/www:/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
openidProvider = standardStableContainer "openid-provider" openidProvider = standardStableDockerContainer "openid-provider"
& alias "openid.kitenet.net" & alias "openid.kitenet.net"
& Docker.publish "8081:80" & Docker.publish "8081:80"
& OpenId.providerFor [User "joey", User "liw"] & OpenId.providerFor [User "joey", User "liw"]
@ -427,7 +435,7 @@ openidProvider = standardStableContainer "openid-provider"
-- Exhibit: kite's 90's website. -- Exhibit: kite's 90's website.
ancientKitenet :: Docker.Container ancientKitenet :: Docker.Container
ancientKitenet = standardStableContainer "ancient-kitenet" 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"
@ -435,7 +443,7 @@ ancientKitenet = standardStableContainer "ancient-kitenet"
(Just "remotes/origin/old-kitenet.net") (Just "remotes/origin/old-kitenet.net")
oldusenetShellBox :: Docker.Container oldusenetShellBox :: Docker.Container
oldusenetShellBox = standardStableContainer "oldusenet-shellbox" oldusenetShellBox = standardStableDockerContainer "oldusenet-shellbox"
& alias "shell.olduse.net" & alias "shell.olduse.net"
& Docker.publish "4200:4200" & Docker.publish "4200:4200"
& JoeySites.oldUseNetShellBox & JoeySites.oldUseNetShellBox
@ -450,7 +458,7 @@ jerryPlay = standardContainer "jerryplay" Unstable "amd64"
& Ssh.permitRootLogin True & Ssh.permitRootLogin True
kiteShellBox :: Docker.Container kiteShellBox :: Docker.Container
kiteShellBox = standardStableContainer "kiteshellbox" kiteShellBox = standardStableDockerContainer "kiteshellbox"
& JoeySites.kiteShellBox & JoeySites.kiteShellBox
& Docker.publish "443:443" & Docker.publish "443:443"
@ -483,8 +491,12 @@ standardSystemUnhardened hn suite arch motd = host hn
& Apt.removed ["exim4", "exim4-daemon-light", "exim4-config", "exim4-base"] & Apt.removed ["exim4", "exim4-daemon-light", "exim4-config", "exim4-base"]
`onChange` Apt.autoRemove `onChange` Apt.autoRemove
standardStableContainer :: Docker.ContainerName -> Docker.Container standardStableContainer :: Systemd.MachineName -> Systemd.Container
standardStableContainer name = standardContainer name (Stable "jessie") "amd64" standardStableContainer name = Systemd.container name $
Chroot.debootstrapped (System (Debian (Stable "jessie")) "amd64") mempty
standardStableDockerContainer :: Docker.ContainerName -> Docker.Container
standardStableDockerContainer name = standardContainer name (Stable "jessie") "amd64"
-- This is my standard container setup, Featuring automatic upgrades. -- This is my standard container setup, Featuring automatic upgrades.
standardContainer :: Docker.ContainerName -> DebianSuite -> Architecture -> Docker.Container standardContainer :: Docker.ContainerName -> DebianSuite -> Architecture -> Docker.Container