From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 08:53:57 +0000 (+0200)
Subject: retire i18n.debian.org mail setup
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=d44841bd913cfef95fb0ab552a3ab52edc1c5c99

retire i18n.debian.org mail setup

After discussion on #debian-admin, it seems @i18n.debian.org is not used
these days.

As such, remove tye from the heavy-exim roles and remove the virtual
email domain.  the mx stuff on tye will be cleaned up manually.
---

diff --git a/data/nodes/tye.debian.org.yaml b/data/nodes/tye.debian.org.yaml
index 72d13e083..b8e7d383b 100644
--- a/data/nodes/tye.debian.org.yaml
+++ b/data/nodes/tye.debian.org.yaml
@@ -2,5 +2,3 @@
 classes:
   - roles::i18n
   - roles::l10n
-
-roles::mta::heavy: true
diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 08bc988d6..355247378 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -1,9 +1,3 @@
-<%=
-vdoms = case @fqdn
-        when "tye.debian.org" then "i18n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/i18n.debian.org/mail"
-end
-vdoms
-%>
 <% if @is_mailrelay -%>
 debian.org: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/debian.org
 admin.debian.org: user=mail_admin group=mail_admin directory=/etc/exim4/email-virtualdomains/admin.debian.org