diff --git a/config-joey.hs b/config-joey.hs index 2f8a07d..23390f6 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 e2bcddb..a2eb44b 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" ]