Have the nm role declare its exim virtualdomain

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

diff --git a/modules/roles/manifests/nm.pp b/modules/roles/manifests/nm.pp
index dd026bf..cceb28d 100644 (file)
--- a/modules/roles/manifests/nm.pp
+++ b/modules/roles/manifests/nm.pp
@@ -6,4 +6,9 @@ class roles::nm {
     notify => Exec['service apache2 reload'],
     key    => true,
   }
+
+  exim::vdomain { 'nm.debian.org':
+    owner => 'nm',
+    group => 'nm',
+  }
 }