From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 08:06:53 +0000 (+0200)
Subject: Have the nm role declare its exim virtualdomain
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3324b4ae702172197fe7ad725a36f052f1e67c71;p=mirror%2Fdsa-puppet.git

Have the nm role declare its exim virtualdomain
---

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 645c425f8..7c6941ea9 100644
--- 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 dd026bfdf..cceb28d17 100644
--- 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',
+  }
 }