Have the bugs_master role declare its exim virtualdomain

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index f2e1f59..97ff30c 100644 (file)
--- 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 faaeecc..301f473 100644 (file)
--- 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',
+  }
 }