X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=18ad406f01541b1814a573ba1450f28c47992727;hb=f1c1f8989e7404dbb5139855407b647544179c14;hp=6c9608101c96668986c711e1820cb46679a6439c;hpb=e739bbe61de54a0b1fc01ba09f7802c9332c58fd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 6c9608101..18ad406f0 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -4,9 +4,10 @@
 # @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 smarthost_port the port on which satellites send mail to the smarthost
+# @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)
 class exim (
   Optional[String] $smarthost,
   Boolean $use_smarthost = true,
@@ -16,10 +17,8 @@ class exim (
   Boolean $is_packagesmaster = false,
   Boolean $is_packagesqamaster = false,
   Integer $smarthost_port = 587,
+  Optional[Integer] $mail_port = undef,
 ) {
-  include exim::vdomain::setup
-  include debian_org::mail_incoming_port
-
   if $use_smarthost {
     $heavy = false
 
@@ -28,6 +27,9 @@ class exim (
     }
   } else {
     $heavy = true
+    if $mail_port {
+      fail('Cannot override mail_port in heavy/no-smarthost hosts')
+    }
   }
 
   munin::check { 'ps_exim4': script => 'ps_' }
@@ -42,12 +44,6 @@ class exim (
 
   Package['exim4-daemon-heavy']->Mailalias<| |>
 
-  concat::fragment { 'virtual_domain_template':
-    target  => '/etc/exim4/virtualdomains',
-    content => template('exim/virtualdomains.erb'),
-    order   => '05',
-  }
-
   service { 'exim4':
     ensure  => running,
     require => [
@@ -83,15 +79,26 @@ class exim (
   file { '/etc/mailname':
     content => template('exim/mailname.erb'),
   }
-  file { '/etc/exim4/manualroute':
-    content => template('exim/manualroute.erb')
+
+  concat { '/etc/exim4/virtualdomains': }
+  concat::fragment { 'virtualdomains_header':
+    target  => '/etc/exim4/virtualdomains',
+    content => template('exim/virtualdomains.header.erb'),
+    order   => '00',
   }
+
   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
+    target         => '/etc/exim4/submission-domains',
   }
+
   file { '/etc/exim4/host_blacklist':
     source => 'puppet:///modules/exim/common/host_blacklist',
   }