From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 10:28:42 +0000 (+0200)
Subject: Merge virtualdomains setup into exim/init
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=40dca73423aad7ccb3de32b5d5f044804de8fd53;p=mirror%2Fdsa-puppet.git

Merge virtualdomains setup into exim/init
---

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 92fdc18ec..d0bc0bad8 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -19,8 +19,6 @@ class exim (
   Integer $smarthost_port = 587,
   Optional[Integer] $mail_port = undef,
 ) {
-  include exim::vdomain::setup
-
   if $use_smarthost {
     $heavy = false
 
@@ -81,6 +79,14 @@ class exim (
   file { '/etc/mailname':
     content => template('exim/mailname.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')
   }
diff --git a/modules/exim/manifests/vdomain/setup.pp b/modules/exim/manifests/vdomain/setup.pp
deleted file mode 100644
index ffb2ad73d..000000000
--- a/modules/exim/manifests/vdomain/setup.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class exim::vdomain::setup {
-  concat { '/etc/exim4/virtualdomains':
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    require => Package['exim4-daemon-heavy']
-  }
-
-  concat::fragment { 'virtualdomains_header':
-    target  => '/etc/exim4/virtualdomains',
-    content => template('exim/virtualdomains.header.erb'),
-    order   => '00',
-  }
-}