From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 08:46:29 +0000 (+0200)
Subject: Have the rt role declare its exim virtualdomain
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=33bb403848667e6aea3d0c470b9d40af10679c7e;p=mirror%2Fdsa-puppet.git

Have the rt role declare its exim virtualdomain
---

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index a5504bef5..e812e9de5 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -1,7 +1,5 @@
 <%=
 vdoms = case @fqdn
-	when "reger.debian.org" then "rt.debian.org: user=rt group=rt directory=/srv/rt.debian.org/mail"
-
         when "tye.debian.org" then "i18n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/i18n.debian.org/mail"
 
         when "wolkenstein.debian.org" then "www-master.debian.org: user=debwww group=debwww directory=/srv/www.debian.org/mail/"
diff --git a/modules/roles/manifests/rtmaster.pp b/modules/roles/manifests/rtmaster.pp
index 7c469b659..131c80c12 100644
--- a/modules/roles/manifests/rtmaster.pp
+++ b/modules/roles/manifests/rtmaster.pp
@@ -4,4 +4,10 @@ class roles::rtmaster {
     notify => Exec['service apache2 reload'],
     key    => true,
   }
+
+  # Note that there is also role specific config in exim4.conf
+  exim::vdomain { 'rt.debian.org':
+    mail_user  => 'rt',
+    mail_group => 'rt',
+  }
 }