From f4ce2124ac91c13475193fbfe25fb6877cd3228b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Jul 2014 22:23:49 -0400 Subject: propellor spin --- src/Propellor/Property/Postfix.hs | 5 ++++- src/Propellor/Property/SiteSpecific/JoeySites.hs | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/Postfix.hs b/src/Propellor/Property/Postfix.hs index 03b4367e..027ea4cf 100644 --- a/src/Propellor/Property/Postfix.hs +++ b/src/Propellor/Property/Postfix.hs @@ -6,6 +6,7 @@ import Propellor.Property.File import qualified Data.Map as M import Data.List +import Data.Char installed :: Property installed = Apt.serviceInstalledRunning "postfix" @@ -56,7 +57,9 @@ dedupMainCf = fileProperty "postfix main.cf dedupped" go mainCf parse l | "#" `isPrefixOf` l = Left l - | "=" `isInfixOf` l = Right (separate (== '=') l) + | "=" `isInfixOf` l = + let (k, v) = separate (== '=') l + in Right ((filter (not . isSpace) k), v) | otherwise = Left l fmt k v = k ++ "=" ++ v diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index c7acb9eb..4ecdd9f0 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -396,6 +396,7 @@ kiteMailServer = propertyList "kitenet.net mail server" , "CRON=1" , "NICE=\"--nicelevel 15\"" ] `onChange` Service.restarted "spamassassin" + `describe` "spamd enabled" , Apt.serviceInstalledRunning "spamass-miter" , Apt.installed ["maildrop"] , "/etc/aliases" `File.hasPrivContentExposed` ctx -- cgit v1.2.3