diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-01-09 21:21:06 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-09 21:21:06 -0400 |
| commit | 042b3bee012c17586e0579b91e90ed0047a622c5 (patch) | |
| tree | 70d92d7208e28eedd73ad7635c8f8ca53ba96adf | |
| parent | 2e2f8b4fdd9971ea1d885cf72b9950a97761be9c (diff) | |
propellor spin
| -rw-r--r-- | config-joey.hs | 6 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs index 2f8a07d3..23390f6a 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -257,9 +257,9 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64" & myDnsPrimary False "kitenet.net" [] & myDnsPrimary True "joeyh.name" [] & myDnsPrimary False "ikiwiki.info" [] - & myDnsPrimary False "olduse.net" - [ (RelDomain "article", - CNAME $ AbsDomain "virgil.koldfront.dk") ] + & myDnsPrimary True "olduse.net" + [ (RelDomain "article", CNAME $ AbsDomain "virgil.koldfront.dk") + ] & alias "ns3.branchable.com" & branchableSecondary diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index e2bcddb1..a2eb44b0 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -608,7 +608,7 @@ postfixClientRelay ctx = Postfix.mainCfFile `File.containsLines` -- Configures postfix to have the dkim milter, and no other milters. dkimMilter :: Property dkimMilter = Postfix.mainCfFile `File.containsLines` - [ "inet:localhost:8891" + [ "smtpd_milters = inet:localhost:8891" , "non_smtpd_milters = inet:localhost:8891" , "milter_default_action = accept" ] |