From: Peter Palfrader Date: Sun, 22 Sep 2019 08:11:20 +0000 (+0200) Subject: Have the packages role declare its exim virtualdomain; changing group from Debian... X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=ec95435fb543bb0aa8beb203625187f5a507e87a;p=mirror%2Fdsa-puppet.git Have the packages role declare its exim virtualdomain; changing group from Debian to pkg_maint --- 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', + } }