summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-05-31 18:35:17 -0400
committerJoey Hess2014-05-31 18:35:17 -0400
commit44244b5094032e5dba906490a58c422f2183a41b (patch)
tree94f38b9751ee8e1700814302a12ef4272709be4b /config-joey.hs
parent5fc4b006517051e937cbfa13b5f7ccbc25460c1b (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs8
1 files changed, 3 insertions, 5 deletions
diff --git a/config-joey.hs b/config-joey.hs
index b667f790..ae575ea7 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -54,12 +54,8 @@ hosts = -- (o) `
& Docker.configured
& Docker.docked hosts "oldusenet-shellbox"
-
- & alias "openid.kitenet.net"
& Docker.docked hosts "openid-provider"
`requires` Apt.serviceInstalledRunning "ntp"
-
- & alias "ancient.kitenet.net"
& Docker.docked hosts "ancient-kitenet"
-- I'd rather this were on diatom, but it needs unstable.
@@ -184,20 +180,22 @@ hosts = -- (o) `
-- My own openid provider. Uses php, so containerized for security
-- and administrative sanity.
, standardContainer "openid-provider" Stable "amd64"
+ & alias "openid.kitenet.net"
& Docker.publish "8081:80"
& OpenId.providerFor ["joey", "liw"]
"openid.kitenet.net:8081"
-- Exhibit: kite's 90's website.
, standardContainer "ancient-kitenet" Stable "amd64"
+ & alias "ancient.kitenet.net"
& Docker.publish "1994:80"
& Apt.serviceInstalledRunning "apache2"
& Git.cloned "root" "git://kitenet-net.branchable.com/" "/var/www"
(Just "remotes/origin/old-kitenet.net")
, standardContainer "oldusenet-shellbox" Stable "amd64"
- & Docker.publish "4200:4200"
& alias "shell.olduse.net"
+ & Docker.publish "4200:4200"
& JoeySites.oldUseNetShellBox
-- git-annex autobuilder containers