cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-07-17 22:23:49 -04:00
parent 3e41d350f4
commit f4ce2124ac
Failed to extract signature
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Propellor/Property/Postfix.hs
View File

@ -6,6 +6,7 @@ import Propellor.Property.File
import qualified Data.Map as M import qualified Data.Map as M
import Data.List import Data.List
import Data.Char
installed :: Property installed :: Property
installed = Apt.serviceInstalledRunning "postfix" installed = Apt.serviceInstalledRunning "postfix"
@ -56,7 +57,9 @@ dedupMainCf = fileProperty "postfix main.cf dedupped" go mainCf
parse l parse l
| "#" `isPrefixOf` l = Left 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 | otherwise = Left l
fmt k v = k ++ "=" ++ v fmt k v = k ++ "=" ++ v

1
src/Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -396,6 +396,7 @@ kiteMailServer = propertyList "kitenet.net mail server"
, "CRON=1" , "CRON=1"
, "NICE=\"--nicelevel 15\"" , "NICE=\"--nicelevel 15\""
] `onChange` Service.restarted "spamassassin" ] `onChange` Service.restarted "spamassassin"
`describe` "spamd enabled"
, Apt.serviceInstalledRunning "spamass-miter" , Apt.serviceInstalledRunning "spamass-miter"
, Apt.installed ["maildrop"] , Apt.installed ["maildrop"]
, "/etc/aliases" `File.hasPrivContentExposed` ctx , "/etc/aliases" `File.hasPrivContentExposed` ctx