summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-07-17 22:23:49 -0400
committerJoey Hess2014-07-17 22:23:49 -0400
commitf4ce2124ac91c13475193fbfe25fb6877cd3228b (patch)
tree0ba739c2e811d0187761382eeef79b0b605c04f2 /src
parent3e41d350f4e9105c75bfabd11e740329cfc808d1 (diff)
propellor spin
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/Postfix.hs5
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs1
2 files changed, 5 insertions, 1 deletions
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