summaryrefslogtreecommitdiff
path: root/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-04-13 15:37:43 -0400
committerJoey Hess2014-04-13 15:37:43 -0400
commitf806a55649a5d06b479123e35fef4d592e6efe0d (patch)
treec0f599329a4623a2ecdbb8cc99b84c15f8b5d60a /Propellor
parent95ac5163da904780ae166c2bf3a0addcb8d8870e (diff)
propellor spin
Diffstat (limited to 'Propellor')
-rw-r--r--Propellor/Property/SiteSpecific/JoeySites.hs23
1 files changed, 13 insertions, 10 deletions
diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs
index 9192786c..3115d4b7 100644
--- a/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -104,14 +104,17 @@ gitapacheconf hn =
, "</VirtualHost>"
]
--- Note: needs debian unstable for new kgb
kgbServer :: Property
-kgbServer = propertyList "kgb.kitenet.net setup"
- [ 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"
- ]
-
+kgbServer = withOS desc $ \o -> case o of
+ (Just (System (Debian Unstable) _)) ->
+ ensureProperty $ propertyList desc
+ [ 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"
+ ]
+ _ -> error "kgb server needs Debian unstable (for kgb-bot 1.31+)"
+ where
+ desc = "kgb.kitenet.net setup"