3 files changed, 13 insertions, 3 deletions

diff --git a/src/mailman/config/mailman.cfg b/src/mailman/config/mailman.cfg
index 075cc8038..5681dff57 100644
--- a/src/mailman/config/mailman.cfg
+++ b/src/mailman/config/mailman.cfg
@@ -25,7 +25,7 @@
 [paths.dev]
 # Convenient development layout where everything is put in the current
 # directory.
-var_dir: .
+var_dir: var
 
 [paths.fhs]
 # Filesystem Hiearchy Standard 2.3
diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg
index 4f3475b3f..adc7784b8 100644
--- a/src/mailman/config/schema.cfg
+++ b/src/mailman/config/schema.cfg
@@ -339,8 +339,10 @@ outgoing: mailman.mta.deliver.deliver
 smtp_host: localhost
 smtp_port: 25
 
-# Where the LMTP server listens for connections.
-lmtp_host: localhost
+# Where the LMTP server listens for connections.  Use 127.0.0.1 instead of
+# localhost for Postfix integration, because Postfix only consults DNS
+# (e.g. not /etc/hosts).
+lmtp_host: 127.0.0.1
 lmtp_port: 8024
 
 # Ceiling on the number of recipients that can be specified in a single SMTP
diff --git a/src/mailman/tests/test_configfile.py b/src/mailman/tests/test_configfile.py
index 726ad8754..95623a785 100644
--- a/src/mailman/tests/test_configfile.py
+++ b/src/mailman/tests/test_configfile.py
@@ -76,9 +76,17 @@ class TestConfigFileBase(unittest.TestCase):
 
     def setUp(self):
         self._root = tempfile.mkdtemp()
+        # Ensure that the environment can't cause test failures.
+        self.mailman_config_file = os.environ('MAILMAN_CONFIG_FILE')
+        if self.mailman_config_file is not None:
+            del os.environ['MAILMAN_CONFIG_FILE']
 
     def tearDown(self):
         shutil.rmtree(self._root)
+        # Restore the environment, though I'm not actually sure this is
+        # necessary.
+        if self.mailman_config_file is not None:
+            os.environ['MAILMAN_CONFIG_FILE'] = self.mailman_config_file
 
     def _make_fake(self, path):
         if path.startswith('/'):