Have the qa and packages.qa roles declare their exim virtualdomain

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index b418956..a5504be 100644 (file)
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -1,8 +1,5 @@
 <%=
 vdoms = case @fqdn
-        when "quantz.debian.org" then "qa.debian.org: user=qa group=qa directory=/srv/qa.debian.org/mail/
-packages.qa.debian.org: user=qa group=qa directory=/srv/packages.qa.debian.org/mail"
-
        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"

diff --git a/modules/roles/manifests/packagesqamaster.pp b/modules/roles/manifests/packagesqamaster.pp
index fe72444..3aa8648 100644 (file)
--- a/modules/roles/manifests/packagesqamaster.pp
+++ b/modules/roles/manifests/packagesqamaster.pp
@@ -1,4 +1,10 @@
 class roles::packagesqamaster {
   include apache2
   ssl::service { 'packages.qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+
+  # Note that there is also role specific config in exim4.conf
+  exim::vdomain { 'packages.qa.debian.org':
+    owner => 'qa',
+    group => 'qa',
+  }
 }

diff --git a/modules/roles/manifests/qamaster.pp b/modules/roles/manifests/qamaster.pp
index d10c1a4..94bb675 100644 (file)
--- a/modules/roles/manifests/qamaster.pp
+++ b/modules/roles/manifests/qamaster.pp
@@ -3,4 +3,9 @@ class roles::qamaster {
   include roles::sso_rp
 
   ssl::service { 'qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+
+  exim::vdomain { 'qa.debian.org':
+    owner => 'qa',
+    group => 'qa',
+  }
 }