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

propellor spin

This commit is contained in:
Joey Hess 2015-01-09 21:21:06 -04:00
parent 2e2f8b4fdd
commit 042b3bee01
Failed to extract signature
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config-joey.hs
View File

@ -257,9 +257,9 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
& myDnsPrimary False "kitenet.net" [] & myDnsPrimary False "kitenet.net" []
& myDnsPrimary True "joeyh.name" [] & myDnsPrimary True "joeyh.name" []
& myDnsPrimary False "ikiwiki.info" [] & myDnsPrimary False "ikiwiki.info" []
& myDnsPrimary False "olduse.net" & myDnsPrimary True "olduse.net"
[ (RelDomain "article", [ (RelDomain "article", CNAME $ AbsDomain "virgil.koldfront.dk")
CNAME $ AbsDomain "virgil.koldfront.dk") ] ]
& alias "ns3.branchable.com" & alias "ns3.branchable.com"
& branchableSecondary & branchableSecondary

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

@ -608,7 +608,7 @@ postfixClientRelay ctx = Postfix.mainCfFile `File.containsLines`
-- Configures postfix to have the dkim milter, and no other milters. -- Configures postfix to have the dkim milter, and no other milters.
dkimMilter :: Property dkimMilter :: Property
dkimMilter = Postfix.mainCfFile `File.containsLines` dkimMilter = Postfix.mainCfFile `File.containsLines`
[ "inet:localhost:8891" [ "smtpd_milters = inet:localhost:8891"
, "non_smtpd_milters = inet:localhost:8891" , "non_smtpd_milters = inet:localhost:8891"
, "milter_default_action = accept" , "milter_default_action = accept"
] ]