X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=9746763010eed6906df92dc1776abe2b77331e1f;hb=e143e95a9bd27ba77fb02aa8e02e665a0ada6382;hp=981219abcb580fb0fdca65afc9501e14c9fae8b3;hpb=7c775abc6070e79f1b812544cb96b9a422ac11fa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 981219abc..974676301 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)
@@ -19,8 +19,6 @@ class exim (
   Integer $smarthost_port = 587,
   Optional[Integer] $mail_port = undef,
 ) {
-  include exim::vdomain::setup
-
   if $use_smarthost {
     $heavy = false
 
@@ -46,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 => [
@@ -87,17 +79,27 @@ class exim (
   file { '/etc/mailname':
     content => template('exim/mailname.erb'),
   }
-  if ! defined(Class['exim::mailrelay']) {
-    file { '/etc/exim4/manualroute':
-      ensure => absent,
-    }
+
+  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',
+    order          => '00',
   }
+
   file { '/etc/exim4/host_blacklist':
     source => 'puppet:///modules/exim/common/host_blacklist',
   }