Have the packages role declare its exim virtualdomain; changing group from Debian...

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

diff --git a/modules/roles/manifests/packages.pp b/modules/roles/manifests/packages.pp
index a4f14a6..25e87fd 100644 (file)
--- a/modules/roles/manifests/packages.pp
+++ b/modules/roles/manifests/packages.pp
@@ -4,4 +4,9 @@ class roles::packages {
   }
 
   ssl::service { 'packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+
+  exim::vdomain { 'packages.debian.org':
+    owner => 'pkg_user',
+    group => 'pkg_maint',
+  }
 }