Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet: (29 commits)
  ordering hint
  add sonntag
  Add buxtehude
  Add buxtehude
  Add a fi
  Try this
  More output
  Try this
  Try to do network right at osuosl
  end
  Try to make dsa.conf.erb a useful template
  ganeti module on byrd
  Add quotes
  Only do the ferm stuff for cluster ganeti2.d.o
  Fix spacing
  Say which ganeti cluster we are in
  Add byrd
  remove vivaldi (RT#3802)
  widor is getting hammered
  mode is important
  ...

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index d8b5f2e..557430d 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -136,6 +136,7 @@ nameinfo:
   tye.debian.org: Christopher Tye (c.1505 - 1573)
   ullmann.debian.org: Viktor Ullmann (January 1st, 1898 - October 17th, 1944)
   unger.debian.org: Caroline Unger (October 28th, 1803 - March 23th, 1877)
+  vento.debian.org: Ivo de Vento (1543/1545 - 1575)
   vitry.debian.org: Philippe de Vitry (October 31st, 1291 - June 9th, 1361)
   widor.debian.org: Charles-Marie Jean Albert Widor (February 21st, 1844 - March 12th, 1937)
   wieck.debian.org: Clara Josephine Wieck (September 13th, 1819 - May 20th, 1896)

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index fa6eef4..5f3dc4f 100644 (file)
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -71,6 +71,8 @@ packages.qa.debian.org: user=qa group=qa directory=/srv/packages.qa.debian.org/m
         when "tye.debian.org" then "i18n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/i18n.debian.org/mail
 l10n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/l10n.debian.org/mail"
 
+       when "vento.debian.org" then "vote.debian.org: user=secretary group=debvote directory=/org/vote.debian.org/mail/"
+
         when "wolkenstein.debian.org" then "www-master.debian.org: user=debwww group=debwww directory=/srv/www.debian.org/mail/"
 end
 vdoms