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

Fix Postfix.satellite bug; the default relayhost was set to the domain, not to smtp.domain as documented.

This commit is contained in:
Joey Hess 2015-05-29 22:52:46 -04:00
parent b5a8c7227b
commit ea1598768c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -9,6 +9,8 @@ propellor (2.5.0) UNRELEASED; urgency=medium
your own Properties when using propellor as a library. your own Properties when using propellor as a library.
* Improve enter-machine scripts for nspawn containers to unset most * Improve enter-machine scripts for nspawn containers to unset most
environment variables. environment variables.
* Fix Postfix.satellite bug; the default relayhost was set to the
domain, not to smtp.domain as documented.
-- Joey Hess <id@joeyh.name> Thu, 07 May 2015 12:08:34 -0400 -- Joey Hess <id@joeyh.name> Thu, 07 May 2015 12:08:34 -0400

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

@ -22,7 +22,8 @@ reloaded :: Property NoInfo
reloaded = Service.reloaded "postfix" reloaded = Service.reloaded "postfix"
-- | Configures postfix as a satellite system, which -- | Configures postfix as a satellite system, which
-- relays all mail through a relay host, which defaults to smtp.domain. -- relays all mail through a relay host, which defaults to smtp.domain,
-- but can be changed by mainCf "relayhost"
-- --
-- The smarthost may refuse to relay mail on to other domains, without -- The smarthost may refuse to relay mail on to other domains, without
-- futher coniguration/keys. But this should be enough to get cron job -- futher coniguration/keys. But this should be enough to get cron job
@ -34,14 +35,14 @@ satellite = check (not <$> mainCfIsSet "relayhost") setup
setup = trivial $ property "postfix satellite system" $ do setup = trivial $ property "postfix satellite system" $ do
hn <- asks hostName hn <- asks hostName
let (_, domain) = separate (== '.') hn let (_, domain) = separate (== '.') hn
ensureProperties ensureProperties
[ Apt.reConfigure "postfix" [ Apt.reConfigure "postfix"
[ ("postfix/main_mailer_type", "select", "Satellite system") [ ("postfix/main_mailer_type", "select", "Satellite system")
, ("postfix/root_address", "string", "root") , ("postfix/root_address", "string", "root")
, ("postfix/destinations", "string", "localhost") , ("postfix/destinations", "string", "localhost")
, ("postfix/mailname", "string", hn) , ("postfix/mailname", "string", hn)
] ]
, mainCf ("relayhost", domain) , mainCf ("relayhost", "smtp." ++ domain)
`onChange` reloaded `onChange` reloaded
] ]