From 80e1029d98054b460fc80b74de47ebe99972e18f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 9 Oct 2018 11:54:27 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index a18e4367..ff096d95 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -178,22 +178,16 @@ oldUseNetInstalled pkg = check (not <$> Apt.isInstalled pkg) $ `assume` MadeChange `describe` "olduse.net built" -kgbServer :: Property (HasInfo + Debian) +kgbServer :: Property (HasInfo + DebianLike) kgbServer = propertyList desc $ props - & installed + & Apt.serviceInstalledRunning "kgb-bot" + & "/etc/default/kgb-bot" `File.containsLine` "BOT_ENABLED=1" + `describe` "kgb bot enabled" + `onChange` Service.running "kgb-bot" & File.hasPrivContent "/etc/kgb-bot/kgb.conf" anyContext `onChange` Service.restarted "kgb-bot" where desc = "kgb.kitenet.net setup" - installed :: Property Debian - installed = withOS desc $ \w o -> case o of - (Just (System (Debian _ Unstable) _)) -> - ensureProperty w $ propertyList desc $ props - & Apt.serviceInstalledRunning "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+)" -- git.kitenet.net and git.joeyh.name gitServer :: [Host] -> Property (HasInfo + DebianLike) -- cgit v1.2.3