summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-04-13 13:09:48 -0400
committerJoey Hess2014-04-13 13:09:48 -0400
commitf428ccd9b1fa32fac7415910021be8f51f66857c (patch)
treefaf710ab8df49085d5d5f8c07b1b8849928432b7 /config-joey.hs
parentb9d2fcc432da003e2c6054a0d6bcbd7eb8457cf0 (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs22
1 files changed, 8 insertions, 14 deletions
diff --git a/config-joey.hs b/config-joey.hs
index ca7a0219..9976592e 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -48,11 +48,15 @@ hosts =
& cname "ancient.kitenet.net"
& Docker.docked hosts "ancient-kitenet"
- -- I'd rather this container were on diatom, but
- -- docker.io is not available in stable.
+ -- I'd rather this were on diatom, but I use features
+ -- not available in stable.
& cname "kgb.kitenet.net"
- & Docker.docked hosts "kgb-server"
-
+ & Apt.serviceInstalledRunning "kgb-bot"
+ & File.hasPrivContent "/etc/kgb-bot/kgb.conf"
+ `onChange` Service.restarted "kgb-bot"
+ & "/etc/default/kgb-bot" `File.containsLine` "BOT_ENABLED=1"
+ `describe` "kgb bot enabled"
+ `onChange` Service.running "kgb-bot"
& Docker.garbageCollected `period` Daily
& Apt.installed ["git-annex", "mtr", "screen"]
@@ -127,16 +131,6 @@ hosts =
& OpenId.providerFor ["joey", "liw"]
"openid.kitenet.net:8081"
- -- The kgb irc bot, in a container for security and because I need
- -- features not in the stable version.
- , standardContainer "kgb-server" Unstable "amd64"
- & Docker.publish "9999:9999"
- & Apt.serviceInstalledRunning "kgb-bot"
- & File.hasPrivContent "/etc/kgb-bot/kgb.conf"
- & "/etc/default/kgb-bot" `File.containsLine` "BOT_ENABLED=1"
- `describe` "kgb bot enabled"
- `onChange` Service.running "kgb-bot"
-
-- Exhibit: kite's 90's website.
, standardContainer "ancient-kitenet" Stable "amd64"
& Docker.publish "1994:80"