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:
  Try to configure ntpdate for hosts with broken RTC
  Revert "get rid of the apt repo until they fix it" - aba says it's all fixed
  Revert "This is part two of d93775534f19bde42d75c6debe391cc701c54993"
  Add sompek.debian.org
  This is part two of d93775534f19bde42d75c6debe391cc701c54993 Signed-off-by: Stephen Gran <steve@lobefin.net>
  get rid of the apt repo until they fix it
  That cast rather too broad a net, I think Signed-off-by: Stephen Gran <steve@lobefin.net>
  add some autopostgres munin stuff
  no more pescetti
  one more we ship with puppet
  try some dependency ordering
  add a preferences file for buildd/schroot
  another file that gets autoupdated
  new buildds
  Sort list Signed-off-by: Stephen Gran <steve@lobefin.net>
  Let's try one last time to get it right. Signed-off-by: Stephen Gran <steve@lobefin.net>
  comparison of Fixnum with String failed Signed-off-by: Stephen Gran <steve@lobefin.net>
  Obvious syntax error ... Signed-off-by: Stephen Gran <steve@lobefin.net>
  this may break a lot ...

diff --combined modules/debian-org/misc/local.yaml
index 480740b,ef7f2ae..839b1d1
--- 1/modules/debian-org/misc/local.yaml
--- 2/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@@ -84,7 -84,6 +84,6 @@@ nameinfo
    penalosa.debian.org: Francisco de Peñalosa (c. 1470 - April 1st, 1528)
    pergolesi.debian.org: Giovanni Battista Pergolesi (January 4th, 1710 - March 16th or 17th, 1736)
    peri.debian.org: Jacopo Peri (August 20th, 1561 - August 12th, 1633)
-   pescetti.debian.org: Giovanni Battista Pescetti (ca. 1704  - 1766)
    pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
    piatti.debian.org: Carlo Alfredo Piatti (January 8th, 1822 - July 18th, 1901)
    porpora.debian.org: Niccolò (Antonio) Porpora (17 August 1686 - 3 March 1768)
@@@ -114,6 -113,7 +113,7 @@@
    sibelius.debian.org: Jean Sibelius (December 8th, 1865 - September 20th, 1957)
    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)
    sperger.debian.org: Johannes Matthias Sperger (March 23th, 1750 - May 13th, 1812)
    spohr.debian.org: Louis Spohr (April 5th, 1784 - October 22nd, 1859)
    spontini.debian.org: Gaspare Luigi Pacifico Spontini (November 14th, 1774 - January 24th, 1851)
@@@ -146,9 -146,7 +146,9 @@@ services
    mailrelay:
      - kokkonen.debian.org
      - merikanto.debian.org
 -  muninmaster: spohr.debian.org
 +  muninmaster:
 +    - spohr.debian.org
 +    - rossini.debian.org
    nagiosmaster: tchaikovsky.debian.org
    extranrpeclient:
      - orff.debian.org
@@@ -205,6 -203,8 +205,8 @@@ host_settings
      - orff.debian.org
      - ravel.debian.org
      - busoni.debian.org
+   broken-rtc:
+     - sompek.debian.org
    buildd:
      - alain.debian.org
      - alkman.debian.org
@@@ -231,7 -231,10 +233,10 @@@
      - hasse.debian.org
      - hebden.debian.org
      - henze.debian.org
+     - hildegard.debian.org
      - hoiby.debian.org
+     - howells.debian.org
+     - hummel.debian.org
      - krenek.debian.org
      - lebrun.debian.org
      - lucatelli.debian.org
@@@ -250,8 -253,8 +255,8 @@@
      - vitry.debian.org
      - zandonai.debian.org
      - zappa.debian.org
-     - zemlinsky.debian.org
      - zee.debian.org
+     - zemlinsky.debian.org
    #wheezy:
    #  - harris.debian.org
    #  - hartmann.debian.org
@@@ -328,7 -331,6 +333,6 @@@
    #  - nono.debian.org
    #  - orff.debian.org
    #  - paganini.debian.org
-   #  - pescetti.debian.org
    #  - pergolesi.debian.org
    #  - pettersson.debian.org
    #  - piatti.debian.org
@@@ -466,7 -468,6 +470,6 @@@
      penalosa.debian.org: mailout.debian.org
      pergolesi.debian.org: mailout.debian.org
      peri.debian.org: mailout.debian.org
-     pescetti.debian.org: mailout.debian.org
      pettersson.debian.org: mailout.debian.org
      piatti.debian.org: mailout.debian.org
      porpora.debian.org: mailout.debian.org
@@@ -492,6 -493,7 +495,7 @@@
      sibelius.debian.org: mailout.debian.org
      smetana.debian.org: mailout.debian.org
      soler.debian.org: mailout.debian.org
+     sompek.debian.org: mailout.debian.org
      sperger.debian.org: mailout.debian.org
      spontini.debian.org: mailout.debian.org
      stabile.debian.org: mailout.debian.org