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 --combined modules/debian-org/misc/local.yaml
index 6aab03914ce39402e8965098c89c4d8ea2cc2b95,d8b5f2eda576134b59981ac622be5c21ce028239..557430de44c37929545d604a8ea0eb29b714d55b
--- 1/modules/debian-org/misc/local.yaml
--- 2/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@@ -24,6 -24,8 +24,8 @@@ nameinfo
    boiti.debian.org: Arrigo Boito (February 24th, 1842 - June 10th, 1918)
    brahms.debian.org: Johannes Brahms (May 7th, 1833 - April 3rd, 1897)
    busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1st, 1866 - July 27th, 1924)
+   buxtehude.debian.org: Dieterich Buxtehude (c. 1637 to 1639 -—May 9th, 1707)
+   byrd.debian.org: William Byrd (1543 - July 4th, 1623)
    chopin.debian.org: Frédéric Chopin (March 1st, 1810 - October 17th, 1849)
    cilea.debian.org: Francesco Cilèa (July 26th, 1866 - November 20th, 1950)
    corelli.debian.org: Arcangelo Corelli (February 17th, 1653 - January 8th, 1713)
@@@ -42,6 -44,7 +44,7 @@@
    fano.debian.org: Guido Alberto Fano (March 18th, 1875 - August 14th, 1961)
    fasch.debian.org: Johann Friedrich Fasch (1688 - 1758)
    field.debian.org: John Field (1782 - 1837)
+   fils.debian.org: Anton Fils (September 22nd, 1733 (baptized) - March 14th, 1760 (buried))
    finzi.debian.org: Gerald Raphael Finzi (July 14th, 1901 - September 27th, 1956)
    fischer.debian.org: Johann Caspar Ferdinand Fischer (September 9th, 1656 - August 27th, 1746)
    franck.debian.org: Melchior Franck (1579 - June 1st, 1639)
@@@ -119,6 -122,7 +122,7 @@@
    smetana.debian.org: Bedřich Smetana (March 2nd, 1824 - May 12th, 1884)
    soler.debian.org: Padre Antonio Soler (December 3rd, 1729 (baptized) - December 20th, 1783)
    sompek.debian.org: Ernst Sompek (Juni 11th 1876 - August 2nd 1954)
+   sonntag.debian.org: Brunhilde Sonntag (27 September 1936 - 18 December 2002) 
    stadler.debian.org: Maximilian Johann Karl Dominik Stadler, Abbé Stadler (August 4th 1748 - November 8th 1833)
    sperger.debian.org: Johannes Matthias Sperger (March 23th, 1750 - May 13th, 1812)
    spohr.debian.org: Louis Spohr (April 5th, 1784 - October 22nd, 1859)
@@@ -132,9 -136,7 +136,8 @@@
    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)
-   vivaldi.debian.org: Antonio Lucio Vivaldi (March 4th, 1678 - July 28th, 1741)
    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)
    wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445)
@@@ -153,6 -155,7 +156,7 @@@ services
    bugsmaster:
    bugsmx:
      - busoni.debian.org
+     - buxtehude.debian.org
    bugs_mirror:
      - beach.debian.org
    dbmaster:
@@@ -190,6 -193,7 +194,7 @@@ host_settings
      - bellini.debian.org
      - bizet.debian.org
      - busoni.debian.org
+     - buxtehude.debian.org
      - chopin.debian.org
      - draghi.debian.org
      - franck.debian.org

diff --combined modules/exim/templates/virtualdomains.erb
index 82c20a62e5dcc7d6b8060c6db9a78ff325e07310,fa6eef43ad42404dd24213c98a15078cb18d0349..5f3dc4f033997338ac29b13e383f560eb317e7ca
--- 1/modules/exim/templates/virtualdomains.erb
--- 2/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@@ -22,6 -22,7 +22,7 @@@ vdoms = case scope.lookupvar('::fqdn'
          when "bellini.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/org/popcon.debian.org/mail/"
  
          when "busoni.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
+         when "buxtehude.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
  
          when "chopin.debian.org" then "security.debian.org: user=mail_security group=nogroup directory=/srv/security-master.debian.org/mail/"
  
@@@ -70,8 -71,6 +71,8 @@@ packages.qa.debian.org: user=qa group=q
          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