From ec95435fb543bb0aa8beb203625187f5a507e87a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 22 Sep 2019 10:11:20 +0200 Subject: [PATCH] Have the packages role declare its exim virtualdomain; changing group from Debian to pkg_maint --- modules/exim/templates/virtualdomains.erb | 2 -- modules/roles/manifests/packages.pp | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index 7c6941ea9..33cbab763 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains.erb @@ -1,7 +1,5 @@ <%= vdoms = case @fqdn - when "picconi.debian.org" then "packages.debian.org: user=pkg_user group=Debian directory=/srv/packages.debian.org/mail/" - 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/ diff --git a/modules/roles/manifests/packages.pp b/modules/roles/manifests/packages.pp index a4f14a617..25e87fdf8 100644 --- a/modules/roles/manifests/packages.pp +++ b/modules/roles/manifests/packages.pp @@ -4,4 +4,9 @@ class roles::packages { } ssl::service { 'packages.debian.org': notify => Exec['service apache2 reload'], key => true, } + + exim::vdomain { 'packages.debian.org': + owner => 'pkg_user', + group => 'pkg_maint', + } } -- 2.20.1