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

diff --combined modules/debian-org/misc/local.yaml
index bbb1572,dd10e88..6e98dec
--- 1/modules/debian-org/misc/local.yaml
--- 2/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@@ -71,7 -71,6 +71,6 @@@ nameinfo
    poulenc.debian.org: Francis Jean Marcel Poulenc (January 7, 1899 - January 30, 1963)
    powell.debian.org: Andrew Powell (b. April 18th, 1949)
    praetorius.debian.org: Hieronymus Praetorius (August 10th, 1560 - January 27th, 1629)
-   puccini.debian.org: Giacomo Antonio Domenico Michele Secondo Maria Puccini (December 22nd, 1858 - November 29th, 1924)
    raff.debian.org: Joseph Joachim Raff (May 27th, 1822 - June 24th or 25th, 1882)
    rautavaara.debian.org: Einojuhani Rautavaara (born October 9th, 1928)
    ravel.debian.org: Joseph-Maurice Ravel (March 7th, 1875 - December 28th, 1937)
@@@ -146,6 -145,7 +145,6 @@@ host_settings
      - morricone.debian.org
      - powell.debian.org
      - ravel.debian.org
 -    - ries.debian.org
      - spohr.debian.org
      - valente.debian.org
    apache2_security_mirror:
@@@ -192,7 -192,6 +191,6 @@@
      - porpora.debian.org
      - poulenc.debian.org
      - praetorius.debian.org
-     - puccini.debian.org
      - rem.debian.org
      - schroeder.debian.org
      - spontini.debian.org
@@@ -277,12 -276,10 +275,11 @@@
      porpora.debian.org: mailout.debian.org
      poulenc.debian.org: mailout.debian.org
      praetorius.debian.org: mailout.debian.org
-     puccini.debian.org: mailout.debian.org
      raff.debian.org: mailout.debian.org
      rautavaara.debian.org: mailout.debian.org
      rem.debian.org: mailout.debian.org
      respighi.debian.org: mailout.debian.org
 +    ries.debian.org: mailout.debian.org
      rietz.debian.org: mailout.debian.org
      rore.debian.org: mailout.debian.org
      rossini.debian.org: mailout.debian.org
@@@ -320,7 -317,6 +317,6 @@@
    no_munin:
      - agnesi.debian.org
      - allegri.debian.org
-     - byrd.debian.org
      - escher.debian.org
      - fano.debian.org
      - malo.debian.org

diff --combined modules/sudo/files/common/sudoers
index 3d482d7,dac4178..559ec9b
--- 1/modules/sudo/files/common/sudoers
--- 2/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@@ -24,7 -24,7 +24,7 @@@ Defaults      passprompt="[sudo] password fo
  Host_Alias    QAHOSTS         = master, merkel
  Host_Alias    WEBHOSTS        = klecker, wolkenstein
  Host_Alias    SECHOSTS        = klecker, chopin
 -Host_Alias    FTPHOSTS        = ries, franck
 +Host_Alias    FTPHOSTS        = franck
  Host_Alias    ZIVITHOSTS      = zelenka, zandonai
  Host_Alias    AACRAIDHOSTS    = bellini, cimarosa, morricone, paganini, respighi, vivaldi, beethoven, pettersson
  Host_Alias    MEGARAIDHOSTS   = grieg, rautavaara, sibelius
@@@ -57,6 -57,8 +57,8 @@@ nagios                ALL=(ALL)       NOPASSWD: /usr/sbin/h
  nagios                ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9] show
  nagios                ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9][0-9] show
  nagios                ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] show status
+ nagios                franck=(ALL)    NOPASSWD: /usr/sbin/hpacucli controller slot=1 enclosure 1E\:1 show detail
+ 
  # other raid controllers
  nagios                powell=(ALL)    NOPASSWD: /usr/local/sbin/areca-cli vsf info
  nagios                puccini=(ALL)   NOPASSWD: /usr/local/bin/tw_cli info c0 u0 status