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

Have the bugs_master role declare its exim virtualdomain
---

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index f2e1f59c8..97ff30c2a 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -1,8 +1,6 @@
 <%=
 vdoms = case @fqdn
 
-        when "buxtehude.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
-
         when "draghi.debian.org" then "db.debian.org: user=mail_db group=nogroup directory=/srv/db.debian.org/mail"
 
         when "wuiet.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail"
diff --git a/modules/roles/manifests/bugs_master.pp b/modules/roles/manifests/bugs_master.pp
index faaeecc4d..301f47396 100644
--- a/modules/roles/manifests/bugs_master.pp
+++ b/modules/roles/manifests/bugs_master.pp
@@ -3,4 +3,9 @@ class roles::bugs_master {
 
   ssl::service { 'bugs-devel.debian.org': notify  => Exec['service apache2 reload'], key => true, }
   ssl::service { 'bugs-master.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+
+  exim::vdomain { 'bugs.debian.org':
+    owner => 'debbugs',
+    group => 'debbugs',
+  }
 }