From 3dcdc1b0fac9a479c63721060d9a1c56a8f1f717 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 22 Sep 2019 10:14:58 +0200 Subject: [PATCH] Have the popcon role declare its exim virtualdomain --- modules/exim/templates/virtualdomains.erb | 2 -- modules/roles/manifests/popcon.pp | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index 33cbab763..b4189560a 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains.erb @@ -1,7 +1,5 @@ <%= vdoms = case @fqdn - when "pinel.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/srv/popcon.debian.org/mail/" - when "quantz.debian.org" then "qa.debian.org: user=qa group=qa directory=/srv/qa.debian.org/mail/ packages.qa.debian.org: user=qa group=qa directory=/srv/packages.qa.debian.org/mail" diff --git a/modules/roles/manifests/popcon.pp b/modules/roles/manifests/popcon.pp index 1a2866c34..1a7892dde 100644 --- a/modules/roles/manifests/popcon.pp +++ b/modules/roles/manifests/popcon.pp @@ -13,4 +13,9 @@ class roles::popcon { site => 'popcon.debian.org', source => 'puppet:///modules/roles/popcon/popcon.debian.org.conf', } + + exim::vdomain { 'popcon.debian.org': + owner => 'popcon', + group => 'popcon', + } } -- 2.20.1