X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=92fdc18ec4832948d5146c90624ea696f7bd77bf;hb=ec1fa09c54aa7b7ec894577929e96ebe97a94508;hp=5eb492376fadbbeacebbae101b1c0daa1512690c;hpb=1a00b051fd2f0be260703095b1c7f95ae601243d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 5eb492376..92fdc18ec 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -10,7 +10,6 @@
 # @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,
-  Optional[Integer] $mail_port,
   Boolean $use_smarthost = true,
   Boolean $is_bugsmx = false,
   Boolean $is_mailrelay = false,
@@ -18,9 +17,9 @@ 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
@@ -47,12 +46,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 => [
@@ -88,9 +81,6 @@ class exim (
   file { '/etc/mailname':
     content => template('exim/mailname.erb'),
   }
-  file { '/etc/exim4/manualroute':
-    content => template('exim/manualroute.erb')
-  }
   file { '/etc/exim4/locals':
     content => template('exim/locals.erb')
   }