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:
  Revert "try two on this"
  try two on this
  Revert "let's test how broken this is"
  Revert "oops"
  oops
  let's test how broken this is
  Or schroot -l
  install fake-hwclock on broken-rtc machines
  no rtc for lucatelli
  samhain ignore /etc/fake-hwclock.data
  resolve ntpservers from names on puppet servers for ntpdate (used on hosts with broken rtc)
  move etc/default/ntpdate to a template
  ancina has a broken RTC
  reboot-lock

diff --combined modules/debian-org/misc/local.yaml
index 9db7419,8110cac..098f0fd
--- 1/modules/debian-org/misc/local.yaml
--- 2/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@@ -27,7 -27,6 +27,7 @@@ nameinfo
    corelli.debian.org: Arcangelo Corelli (February 17th, 1653 - January 8th, 1713)
    czerny.debian.org: Carl Czerny (February 21st, 1791 - July 15th, 1857)
    danzi.debian.org: Franz Ignaz Danzi (June 15th, 1763 - April 13th, 1826)
 +  diabelli.debian.org: Anton Diabelli (September 5th, 1781 - April 7th, 1858)
    diamond.debian.org: David Leo Diamond (July 9, 1915 - June 13, 2005)
    dijkstra.debian.org: Lowell Dijkstra (b.1952)
    draghi.debian.org: Antonio Draghi (1635 - January 16th, 1700)
@@@ -214,10 -213,12 +214,12 @@@ host_settings
      - abel.debian.org
      - alain.debian.org
      - alwyn.debian.org
+     - ancina.debian.org
      - antheil.debian.org
      - arne.debian.org
      - arnold.debian.org
      - ball.debian.org
+     - lucatelli.debian.org
      - rem.debian.org
      - sompek.debian.org
    buildd:
@@@ -423,7 -424,6 +425,7 @@@
      crest.debian.org: mailout.debian.org
      czerny.debian.org: mailout.debian.org
      danzi.debian.org: mailout.debian.org
 +    diabelli.debian.org: mailout.debian.org
      diamond.debian.org: mailout.debian.org
      dijkstra.debian.org: mailout.debian.org
      duarte.debian.org: mailout.debian.org