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

Have the www-master role declare its exim virtualdomain
---

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index e812e9de5..08bc988d6 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -1,8 +1,6 @@
 <%=
 vdoms = case @fqdn
         when "tye.debian.org" then "i18n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/i18n.debian.org/mail"
-
-        when "wolkenstein.debian.org" then "www-master.debian.org: user=debwww group=debwww directory=/srv/www.debian.org/mail/"
 end
 vdoms
 %>
diff --git a/modules/roles/manifests/www_master.pp b/modules/roles/manifests/www_master.pp
index 737c1979e..2b3419a58 100644
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -20,4 +20,10 @@ class roles::www_master {
     notify => Exec['service apache2 reload'],
     key    => true,
   }
+
+  exim::vdomain { 'www-master.debian.org':
+    owner   => 'debwww',
+    group   => 'debwww',
+    maildir => '/srv/www.debian.org/mail',
+  }
 }