X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=c3acdce2a9bbc3fd7acdc6c4b64841d2e8c9aa3e;hb=eb1e819a61af91a8fd6586a1f0e5c07dcf00e225;hp=d0bc0bad8f1031a0ba72ef1adb416bbb98cb10ae;hpb=40dca73423aad7ccb3de32b5d5f044804de8fd53;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index d0bc0bad8..c3acdce2a 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -4,7 +4,7 @@
 # @param is_bugsmx this system handles bugs.debian.org
 # @param is_mailrelay this system is a mailrelay, both in and out, for debian hosts
 # @param is_rtmaster this system handles rt.debian.org
-# @param is_packagesmaster this system handles packagesrt.debian.org
+# @param is_packagesmaster this system handles packages.debian.org
 # @param is_packagesqamaster this system handles packages.qa.debian.org
 # @param mail_port override the default incoming mailport (only applicable for hosts behind an incoming relay)
 # @param smarthost_port the port on which satellites send mail to the smarthost (needs to be the same on both sides)
@@ -90,9 +90,14 @@ class exim (
   file { '/etc/exim4/locals':
     content => template('exim/locals.erb')
   }
-  file { '/etc/exim4/submission-domains':
-    content => template('exim/submission-domains.erb'),
+
+  concat { '/etc/exim4/submission-domains':
+    ensure_newline => true,
+    warn           => @(EOF),
+    ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+    | EOF
   }
+
   file { '/etc/exim4/host_blacklist':
     source => 'puppet:///modules/exim/common/host_blacklist',
   }