summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-05-29 22:52:46 -0400
committerJoey Hess2015-05-29 23:07:10 -0400
commitea1598768c4c4b6b4f45148b0940641c5f9f85d2 (patch)
treeb20afcb0f1abdf515e0f6f2ffd10ee5831948bea
parentb5a8c7227b15bb4c821221c6f4c3ca8fd1e1a062 (diff)
Fix Postfix.satellite bug; the default relayhost was set to the domain, not to smtp.domain as documented.
-rw-r--r--debian/changelog2
-rw-r--r--src/Propellor/Property/Postfix.hs7
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 5d70582e..e40f5d3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ propellor (2.5.0) UNRELEASED; urgency=medium
your own Properties when using propellor as a library.
* Improve enter-machine scripts for nspawn containers to unset most
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
diff --git a/src/Propellor/Property/Postfix.hs b/src/Propellor/Property/Postfix.hs
index 073d5dc8..b51f4df1 100644
--- a/src/Propellor/Property/Postfix.hs
+++ b/src/Propellor/Property/Postfix.hs
@@ -22,7 +22,8 @@ reloaded :: Property NoInfo
reloaded = Service.reloaded "postfix"
-- | 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
-- 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
hn <- asks hostName
let (_, domain) = separate (== '.') hn
- ensureProperties
+ ensureProperties
[ Apt.reConfigure "postfix"
[ ("postfix/main_mailer_type", "select", "Satellite system")
, ("postfix/root_address", "string", "root")
, ("postfix/destinations", "string", "localhost")
, ("postfix/mailname", "string", hn)
]
- , mainCf ("relayhost", domain)
+ , mainCf ("relayhost", "smtp." ++ domain)
`onChange` reloaded
]