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

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 93a1a76e107d906be2b515c494dee1f20e43ed8d..f7e13f9fc428d2908e2a935025a0683a1bef7893 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -29,6 +29,7 @@ nameinfo:
   lafayette.debian.org: Eugenie Lafayette
   lebrun.debian.org: Francesca Lebrun (March 24, 1756 - May 14, 1791)
   liszt.debian.org: Franz Liszt (October 22, 1811 - July 31, 1886)
+  luchesi.debian.org: Andrea Luca Luchesi (May 23, 1741 - March 21, 1801)
   mahler.debian.org: Gustav Mahler (7 July 1860 - 18 May 1911)
   mayr.debian.org: Johann(es) Simon Mayr (June 14, 1763 - December 2, 1845)
   merkel.debian.org: Gustav (Adolf) Merkel (November 12, 1827 - October 30, 1885)
@@ -59,6 +60,7 @@ nameinfo:
   schumann.debian.org: Robert Alexander Schumann (8 June 1810 - 29 July 1856)
   senfl.debian.org: Ludwig Senfl (~1490 - ~1543)
   smetana.debian.org: Bedřich Smetana (2 March 1824 - 12 May 1884)
+  soler.debian.org: Padre Antonio Soler (December 3, 1729 (baptized) - December 20, 1783)
   sperger.debian.org: Johannes Matthias Sperger (March 23, 1750 - May 13, 1812)
   spohr.debian.org: Louis Spohr (5 April 1784 - 22 October 1859)
   spontini.debian.org: Gaspare Luigi Pacifico Spontini (14 November 1774 - 24 January 1851)
@@ -122,6 +124,7 @@ host_settings:
     - samosa.debian.org
     - schein.debian.org
     - senfl.debian.org
+    - soler.debian.org
     - spohr.debian.org
     - steffani.debian.org
     - tartini.debian.org

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 76e2e3e5ee05582cfbe7d521134e90b5ab0fdaeb..6edd8fca9a32e8775c512860d0aea8cc062f0468 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -75,6 +75,7 @@ nagios                bellini,cimarosa,morricone,paganini,respighi,vivaldi=(ALL)      NOPASSWD: /us
 %planet                ALL=(planet)    ALL
 %popcon                ALL=(popcon)    ALL
 %secretary     ALL=(secretary) ALL
+%sectracker    ALL=(sectracker)        ALL
 %snapshot      ALL=(snapshot)  ALL
 %uddadm                ALL=(udd)       ALL
 %volatile      ALL=(volatile)  ALL