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

Have the vote role declare its exim virtualdomain
---

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 98086ff02..b2f02c4b9 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -22,8 +22,6 @@ packages.qa.debian.org: user=qa group=qa directory=/srv/packages.qa.debian.org/m
 
         when "tye.debian.org" then "i18n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/i18n.debian.org/mail"
 
-	when "vento.debian.org" then "vote.debian.org: user=secretary group=debvote directory=/srv/vote.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/vote.pp b/modules/roles/manifests/vote.pp
index 46bf6e16b..f0a2ec160 100644
--- a/modules/roles/manifests/vote.pp
+++ b/modules/roles/manifests/vote.pp
@@ -5,4 +5,9 @@ class roles::vote {
     notify => Exec['service apache2 reload'],
     key    => true,
   }
+
+  exim::vdomain { 'vote.debian.org':
+    owner => 'secretary',
+    group => 'debvote',
+  }
 }