Have the popcon role declare its exim virtualdomain

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

diff --git a/modules/roles/manifests/popcon.pp b/modules/roles/manifests/popcon.pp
index 1a2866c..1a7892d 100644 (file)
--- a/modules/roles/manifests/popcon.pp
+++ b/modules/roles/manifests/popcon.pp
@@ -13,4 +13,9 @@ class roles::popcon {
     site   => 'popcon.debian.org',
     source => 'puppet:///modules/roles/popcon/popcon.debian.org.conf',
   }
+
+  exim::vdomain { 'popcon.debian.org':
+    owner => 'popcon',
+    group => 'popcon',
+  }
 }