From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 8 Jul 2015 16:04:13 +0000 (+0200)
Subject: prepare pinel for popcon
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8c565e6c184971235629c7f66aeac987f10c23ce;p=mirror%2Fdsa-puppet.git

prepare pinel for popcon
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a198495d7..78cbfb52e 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -75,6 +75,7 @@ roles:
     - pejacevic.debian.org
   popcon:
     - popov.debian.org
+    - pinel.debian.org
   pubsub:
     - rainier.debian.org
     - rapoport.debian.org
diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index fd464be7e..14f53d694 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -13,6 +13,7 @@ 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 "popov.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/