From 6ca814ccffe0cd6400fd0fdac2663519ebf43c0d Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 22 Sep 2019 10:02:46 +0200 Subject: [PATCH] Have the dbmaster role declare its exim virtualdomain --- modules/exim/templates/virtualdomains.erb | 3 --- modules/roles/manifests/dbmaster.pp | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index 97ff30c2a..85da04b1a 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains.erb @@ -1,8 +1,5 @@ <%= vdoms = case @fqdn - - when "draghi.debian.org" then "db.debian.org: user=mail_db group=nogroup directory=/srv/db.debian.org/mail" - when "wuiet.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail" when "nono.debian.org" then "nm.debian.org: user=nm group=nm directory=/srv/nm.debian.org/mail/" diff --git a/modules/roles/manifests/dbmaster.pp b/modules/roles/manifests/dbmaster.pp index c9489237d..1a0fa9edc 100644 --- a/modules/roles/manifests/dbmaster.pp +++ b/modules/roles/manifests/dbmaster.pp @@ -48,4 +48,9 @@ class roles::dbmaster { key => $facts['dsa_key'], collect_tag => 'puppetmaster', } + + exim::vdomain { 'db.debian.org': + mail_user => 'mail_db', + mail_group => 'nogroup', + } } -- 2.20.1