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

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet: (40 commits)
  somehow missed mayer
  fuck, really, stop
  stop including ferm for now
  apparently, puppet is not fond of sloppy line endings
  Revert "Revert "not breaking the paths in production branch maybe helps""
  try without extra whitespace
  Revert "not breaking the paths in production branch maybe helps"
  Revert "Revert "not breaking the paths in production branch maybe helps""
  Revert "not breaking the paths in production branch maybe helps"
  not breaking the paths in production branch maybe helps
  single quotes
  single quotes
  Revert "does that work?"
  does that work?
  Revert "maybe staging needs a default environment of staging?"
  the right path helps
  we lost two lines
  picky puppet
  ferm initial checkin
  Initial stab at adding a ferm module
  ...

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 1a839469124eb683eca6768b2c8a80e44dee3990..c2007060a9e0382bad7ea5884d6add4485e15280 100644 (file)
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -11,7 +11,7 @@ rundir=/var/run/puppet
 factpath=$vardir/facts
 pluginsync=true
 # This is the default environment for all clients
-environment=production 
+environment=production
 
 [puppetmasterd]
 templatedir=/etc/puppet/templates

diff --git a/manifests/site.pp b/manifests/site.pp
index 092f3212448d2953d8fbc53c4824cb31b6bb7df9..2bc7939d85725c303ed55b4b841fc6630b9999cb 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -51,6 +51,7 @@ node default {
     case $hostname {
         spohr: {
                       include nagios::server
+                      include munin-node::master
         }
         default: {
                      include nagios::client
@@ -81,6 +82,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt", "ftcollins":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
 }

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index afe41494aeb13de738e68467102ca844b64e3797..d7dc606d3dfafbb0b2329c42dea5cf5df3020a7c 100644 (file)
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -13,6 +13,9 @@ dgi:
   - 93.94.130.128/26
 ftcollins:
   - 192.25.206.0/24
+grnet:
+  - 194.177.211.192/27
+  - 2001:648:2ffc:deb::/64
 nl:
   - 194.109.137.216/29
   - 2001:888:2000:12::/64

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index e70755bc0f53a6a2ca6e2a9e202748a014ad328f..f5c354373eb56a4444109251020e1ffd8382ccf1 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -24,6 +24,7 @@ nameinfo:
   gluck.debian.org: Christoph Willibald Ritter von Gluck (2 July 1714 - 15 November 1787)
   goedel.debian.org: Kurt Gödel (April 28, 1906 - January 14, 1978)
   goetz.debian.org: Hermann Gustav Goetz (December 7, 1840 - December 3, 1876)
+  grieg.debian.org: Edvard Hagerup Grieg (15 June 1843 - 4 September 1907)
   handel.debian.org: Georg Friedrich Händel (23 February 1685 - 14 April 1759)
   kassia.debian.org: Kassia (between 805 and 810 - bef. 867)
   kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735)
@@ -34,6 +35,7 @@ nameinfo:
   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)
+  mayer.debian.org: John Mayer (October 28, 1930 - March 9, 2004)
   merkel.debian.org: Gustav (Adolf) Merkel (November 12, 1827 - October 30, 1885)
   mendes.debian.org: Manuel Mendes (c. 1547 - September 24, 1605)
   merulo.debian.org: Claudio Merulo (8 April 1533 - 4 May 1604)
@@ -54,11 +56,13 @@ nameinfo:
   puccini.debian.org: Giacomo Antonio Domenico Michele Secondo Maria Puccini (December 22, 1858 - November 29, 1924)
   raff.debian.org: Joseph Joachim Raff (May 27, 1822 - June 24 or June 25, 1882)
   ravel.debian.org: Joseph-Maurice Ravel (March 7, 1875 - December 28, 1937)
+  rautavaara.debian.org: Einojuhani Rautavaara (born October 9, 1928)
   respighi.debian.org: Ottorino Respighi (July 9, 1879 - April 18, 1936)
   ries.debian.org: Franz Ries (1846 - 1932)
   rietz.debian.org: August Wilhelm Julius Rietz (December 28, 1812 - September 12, 1877)
   rore.debian.org: Cipriano de Rore (occasionally Cypriano) (1515 or 1516 - between September 11 and September 20, 1565)
   saens.debian.org: Charles-Camille Saint-Saëns  (9 October 1835 - 16 December 1921)
+  samosa.debian.org: The samosa is a stuffed pastry and a popular snack in South Asia, Southeast Asia, Central Asia, the Arabian Peninsula, throughout the Mediterranean (Greece), Southwest Asia, the Horn of Africa and North Africa.
   schein.debian.org: Johann Hermann Schein (January 20, 1586 - November 19, 1630)
   schroeder.debian.org: Hermann Schroeder (1904 - 1984)
   schumann.debian.org: Robert Alexander Schumann (8 June 1810 - 29 July 1856)
@@ -132,6 +136,7 @@ host_settings:
     - ancina.debian.org
     - arcadelt.debian.org
     - argento.debian.org
+    - ball.debian.org
     - brahms.debian.org
     - fano.debian.org
     - finzi.debian.org
@@ -139,6 +144,7 @@ host_settings:
     - goetz.debian.org
     - lafayette.debian.org
     - malo.debian.org
+    - mayr.debian.org
     - murphy.debian.org
     - paer.debian.org
     - penalosa.debian.org
@@ -160,6 +166,16 @@ host_settings:
     arcadelt.debian.org: mailout.debian.org
     argento.debian.org: mailout.debian.org
     bartok.debian.org: mailout.debian.org
+    blade0.debian.org: mailout.debian.org
+    blade1.debian.org: mailout.debian.org
+    blade2.debian.org: mailout.debian.org
+    blade3.debian.org: mailout.debian.org
+    blade4.debian.org: mailout.debian.org
+    blade5.debian.org: mailout.debian.org
+    blade6.debian.org: mailout.debian.org
+    blade7.debian.org: mailout.debian.org
+    blade8.debian.org: mailout.debian.org
+    blade9.debian.org: mailout.debian.org
     brahms.debian.org: mailout.debian.org
     caballero.debian.org: mailout.debian.org
     carver.debian.org: mailout.debian.org
@@ -175,6 +191,7 @@ host_settings:
     gluck.debian.org: mailout.debian.org
     goedel.debian.org: mailout.debian.org
     goetz.debian.org: mailout.debian.org
+    grieg.debian.org: mailout.debian.org
     handel.debian.org: mailout.debian.org
     kassia.debian.org: mailout.debian.org
     lafayette.debian.org: mailout.debian.org
@@ -202,6 +219,7 @@ host_settings:
     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
     rore.debian.org: mailout.debian.org
@@ -223,8 +241,8 @@ host_settings:
     voltaire.debian.org: mailout.debian.org
     wieck.debian.org: mailout.debian.org
     wolkenstein.debian.org: mailout.debian.org
-    zee.debian.org: mailout.debian.org
     zandonai.debian.org: mailout.debian.org
+    zee.debian.org: mailout.debian.org
     zelenka.debian.org: mailout.debian.org
   mail_port:
     ancina.debian.org: 2025

diff --git a/modules/munin-node/manifests/master.pp b/modules/munin-node/manifests/master.pp
new file mode 100644 (file)
index 0000000..cff2941
--- /dev/null
+++ b/modules/munin-node/manifests/master.pp
@@ -0,0 +1,11 @@
+class munin-node::master inherits munin-node {
+
+    package { munin: ensure => installed }
+
+    file {
+        "/etc/munin/munin.conf":
+            content => template("munin-node/munin.conf.erb"),
+            require => Package["munin"];
+    }
+}
+

diff --git a/modules/munin-node/templates/munin.conf.erb b/modules/munin-node/templates/munin.conf.erb
new file mode 100644 (file)
index 0000000..fc09288
--- /dev/null
+++ b/modules/munin-node/templates/munin.conf.erb
@@ -0,0 +1,21 @@
+##
+### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+dbdir   /var/lib/munin
+htmldir /var/www/munin
+logdir  /var/log/munin
+rundir  /var/run/munin
+tmpldir /etc/munin/templates
+graph_strategy cgi
+
+<%= out = ''
+    localinfo.keys.sort.each do |node|
+       out += '[' + node + ']
+    address ' + node + '
+
+'
+     end
+out
+%>

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index eb59db861f7c98072bdabdc8fe176dd7959aed11..5c120ba834a51aed424d459b350decb704c62447 100644 (file)
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -9,9 +9,6 @@ searchpaths = []
 resolvconf  = ''
 
 case hoster
-  when "ubcece" then
-    searchpaths << "debprivate-ubc.debian.org"
-    nameservers += ["206.12.19.5", "137.82.1.1", "142.103.1.1" ]
   when "darmstadt" then
     case hostname
       when "draghi", "liszt" then
@@ -26,6 +23,12 @@ case hoster
     end
     nameservers += ["192.25.206.33", "192.25.206.57"]
     searchpaths << "debprivate-ftcollins.debian.org"
+  when "grnet" then
+    nameservers += ["194.177.210.10", "194.177.210.210"]
+    searchpaths << "debprivate-grnet.debian.org"
+  when "ubcece" then
+    searchpaths << "debprivate-ubc.debian.org"
+    nameservers += ["206.12.19.5", "137.82.1.1", "142.103.1.1" ]
 end
 
 searchpaths << "debian.org"

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 13a7e0ba1c9e109a9c94578210194819e8ecf0a9..9b253832cfbcf43e771c0b3e5749839b25c08c2a 100644 (file)
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -37,4 +37,5 @@ class ssh {
             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
             refreshonly => true,
         }
+
 }

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index 08da26e736eee4ec42f4edf11dc40d7c7308b138..a6093e24bbafcaa6d1dfbd7211bc3eaad6da0814 100644 (file)
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -7,19 +7,10 @@ hosterkeys
 %>
 <%= localkeys = case fqdn
          when "argento.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA5q3myoIMyqv6HhAR4lxaO7OXLRkKqUlEHeCudksc7ZAVSqJAQ3ODn8zAoY34duvRUOq7xpGcl8gXWujCtcUWDZCxNsxz+iWI/3oEaZly/ZTJXtoYUjmUodV7PJ8DbokiJGUIc1s3MiGa9QYam0D28TT8jWCJFcthC7VS61GBgT8= /Users/manon/.ssh/id_rsa - Manon Goo Local Admin"
-         when "bartok.debian.org" then 
-           out = ''
-           keyinfo.keys.sort.each do |node|
-             out += '# ' + keyinfo[node][0]['hostname'].to_s + '
-command="/usr/lib/da-backup/da-backup-ssh-wrap ' + keyinfo[node][0]['hostname'].to_s + '",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="' + keyinfo[node][0]['ipHostNumber'].join(',') + '" ' + keyinfo[node][0]['sshRSAHostKey'].to_s + '
-
-'
-           end
-           out
          when "mahler.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1bAZGQUdVBdX5N8985OG25yYO6wybV0HmL0jeyun8qOmyi15RlkP8XiWXkvBLE98Nh9Ji2UgMZog7geT65zf+bE2crxu9LmAIbNiMgh+Yk6JFCy8ZFiKmCngHLlkWlD3Z4YTYdSxiETXkE4EB1arXi3wt9h7Iq/h7ZmpVL3njaqPGhdZmo9r+c8eZnwD77VIk+pcCB5Yqh3Nu/RaNAMr9hrHfvd62NnYRG3vcdj9aQo3Cshh8tTqzw10B8lCUKrHSbtL8aFzUrZqFilcNWs36mGVnzcLya/TM1uID9z41O47ZDOfZvLkSmGPb44Jwcdt1DK8r60OBdGoHBOa337N7w== noahm@crystalline-entity"
          when "pergolesi.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEA71vh3lytStDCr6df5u2tyzk45L7i8QoNysP51+ga6+v8kwMva30zw5fUD6BHYwNfwo1UZzUtsGLE5HTxKuBlfXs+myWjqpjbF3xSpPjbxKZYiLKMpJ5CVC0Mp6f2kSQ5sSC6Ue/etlAqs9D4rgbexo00QlOtBVof+Zolr3SyR6Y/Coo4UCHeFIAf8KQmhKhYEfPsIgsm+IsnpHglqZ8krOm60Fzo/K5xwb2raoVyg73cvBpaST3VGqqlT2+iTKLHUTaWSOvIj99KV6mYBdD4V8CCs3FWrKfM7wlXwBm/LVmr406Ho0QUo1zHZckvUITHtFQW0QwHpaR717fWB5lBz0d9VlQMz2JR7WfzX+iJqTAnVljjFYJIIHBQR8Xr0Z2rkSEjpi1Ar4iPQbYswMMnBQSGhITMPysHqZb75WYg17cubUbDwpiKPCdmDc5/iNoRFOLOW7vwcBISynUweRDDgeZI7sSFydEnIVK+hrLLmI/XZe4ekhZZXQYCc/tllc9kt2qpU8EWlFs0zSnUD/Lj0WOcgiSOJ3pzQWBBN2EHpM2FfdFa+qUhReSbIrWDgqLe9pkJ2emHFDRhBT4r2f85dw9BSUSVpxpA69fYCyZprJUs214Cq+nTZCSzKFfvflJR7VdCmEu0d5Wavf740OQ4gVipQHqydQVW5m4tYDQHR/s= hb@freenet-rz.de aka holger.baust@freenet-ag.de"
          when "pescetti.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArOaT7YSol/2O0jums0gui3aaycWk8sGz1taDwtQ+UTWzVh0Xn2DGUmBMGvmUVwqY0c7mRI/hOD2BDgvuLv0OQ6guZCLEHnAD4x/bsNucEzSQVEgTywuhans5PxfAGmGWk/thsNcqAE7JjFWGNNR6nj+ZmG299SieNW1wgxCWyQaiju/996yj6YKRN9aT1crNZA+sWi4z51XjPgbX2b55NLWrgmqBX4iSD6bV3nV6LEWXlTZzxUAqJotTD3PF3PWLi5h8kQhAOvT3cG6EkkAQV0TOcZam36x5cPbBek0iDNNQXv1w4fHN6f9qQ2/R5NdF06H91aSmxY7/OZ0XKgYKdw== /home/holgi/.ssh/id_rsa"
-         when "powell.debian.org", "puccini.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEApY3j8pYCpsN/PPZBU8mSdVBV7st3YNqxXp4eMVzkyKF0TwywG5A5Nj6hOquHFR/R19Kf0dfHSr2vLrjJXzH5efl+KGzGReo8rwm1vMZOrzK5lrWgzHlZTRF/CbZbQ1ov2UnCPZnmr+anH/KfJ0Easp751/neZ24oCbf7BOO2E4L8v72utsvEkXu0YRTaKqkZ+slDuDQdtisS6nH3ecnZy3JIy0NZEJFBnB0/Xz3v4Mci5kw5DCVU5jyIH/bUEYTBDQg5WH3Kuwb+SY/bwXgNmZDE4qVFCY73m6JcOWFKMWY3sBFiRRFdVHa32EdMQxdQpOns0uzG06OtGDQFlSuAlw== joerg_debian"
+         when "powell.debian.org", "puccini.debian.org", "bartok.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAvii/FxkFUlSmn4rIuz1AX6B2INlxYmGo4KW9a1qfXk/foZqO8Igaz/c0nULmaC4KTmwOjzoCp1ujeWlTbQhQTTJb/yMc+SjpPCev70OwigCmyfZrpLienlCDQfPHG69QKXgebydkQK7JkVKNT/mBYDeGYG7K23aCNVu9kLanL/4sDbpdPRBleRlUGV+pzgwSbtwlTyKrkPbr4LzNxkVJbkGPMzWxlALCtrH8jgfnbRqnLn36wJzuIWPuWxARr0D7kBOIQTxxH5TkmXk+XVjDDRsbKuRSOi4qKCknmIDGJyx8xEv1fErpAVgzsE6RLWCSVYoBgfaaIJsH0B4xp9ZPUKjvVbUPHM60zwYZcblsdbx5D6RJ04pihHEf58cfALoqLlHwes62aeqeTsEMmm5OK66tGroFoCmm+301i6QBNX4JrDdHODZixV945Q+X345Nth3kathcDCQB1jXvrXKkFRoMff6QQs+HxXlwAHsR+hkSv0YHbcptcGPZFTXpfsiyQTyPHpJOXZsYqCFz0387z4ldSH+Fmq98g1CVgQkNRF8TYHWNp1+pHnrq+gcT8hqv7JDLQ2X6joGmGBpdWkGBmSrRCVQmWmWK0BiDMxb6Z1ysAdLH6mzEwTg3gh4S0BDVmbRb5YNNVI9y5kBNcbX9c7yuiC7IOEKKV5gZOQ5Jv/0= joerg - debianla, 2010-01-15"
          when "rem.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnHlDow0vUPDbi6OXKAkIV2zFi3xcDQAPLLmWJRY25HKvTLxkHlmXZH6CHrgx5deX4EogK6xWOvjUHdi/RD/BRU9DKFt6mepfGQvJQNeHK44S/yDrmPPWJq/bsCVu1ulOiLxGD4I2ei/4cDhWE5WypRC5Mn9+NOmNZp2kk9IL0UQChOQCXsPsVsch4wsuHns135TSzhH68X2iJK6GkqBeTvMs5DFqf2IbB4iLKASTxQITP1O3HYF4I5hVW9RGQD6i61TPAFKHkeruaMR0c4H7+f+jur9uo3URSTAidylspCST0/qg5xpDAcwDcfLItAtBuILQHyA6NSpBKEWA3zFzemJTDB3E/QEMMRInKJZFIhi08gtnETNxERG1+onss62lVCVn21SMYJQqHNW7GYmVqUlZLUKKUmTaualx0MHO8ODVJg2xzk/X0LWeE/0Nht/cg/DuqqA5DtSqXsw22kNAd+bTMnn0i+gahyCeLVswAhBVKjuLtU9SQXA4GsTxAvDd8rPRtusDI146fvPwgJCXMLStnZvs/22oXVdmMwwWbo5u5qUBqX51AjGI2i3b+JYQJrtBRnR0iNJV1VDiuRhsy48C4wUNRGX+DM78fldpKin5XMsSyEludyh9R7vFFtZMQFCqJelxfgDP5pU+jrxhFKY9rVcHTT0BqgWmpwPHkPs= rmurray@cyberhq
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAt3g97cGfOA9DnAKF6h8RlFDppPtyKfjlyvG4f+gTTYAkJVxeC8aCab4rSlhxNKho6r7OoZRj408J0/rr0INtbA4FnepQBZlvWwrV3vZRafVMq6rwXF3hh22d8iDv+g2HTDiGIlgANwaRlQP56gM9C8sF7gGw4PyaU7qG8+AAn3U= flo@paradigm
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwbRijHuvIC6cZUZwUfqLT5t/4GRvqiBBmYXkRRhwMajTOBeaR6vRx9mZ+UdTAUKno8LuMNvFoovvwXBqqwH7yMa/SHgpA0wXl+bcYUbtoRbOVQEXwX/70Yoo0HLMGwoeuddjUICYZQomLYYLlkrWt1in9g4AGzqtmyCcDrxaneGYOvwJIm4sBhhJfns3j8AK7wIAaOA5fU9azR6JofX8g7QhqVrTlww0yOTlHsqheGUnLVzqPTzcJTPLDWKs9DOZT8a+IOc1R5TS2k07IFZk4TjCodW+iLCKHdudqpS8MKOY9EtfDaANl7JeCNa0NUZRVeXX9H4jtPIJ5/naa6m1XQ== Florian.Lohoff(flo,mW-N,RSA,2048)"
@@ -40,3 +31,17 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuWUv0xRqmnrYX/7b80HIAY9s80Qp4QRFH3DXEkuyDepr
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAqtZYwCwuLP2KZOfqdRyKbexfhcfEiwY7en7aYmY7eUxa396Nzhxv1KOl2xpatD40/TPHtU+GUMxa0PLM7Tn5j2HxZ5S/bjp2l881EWJlYUzZjL95e/PBhPM2r6/VvLTHI7dFI+2s2/LDIuRn3dKsIxFncRzZRjPrpks14wpII4UpVTwQSrBMwkweq0anUiUtw/y7s33fSQJKYu7gXkmkm7mtuF8PJnvI6j482pu34GxWGjjSs9f7ZAm2+mXviVedAsrN3E4MgK14Z6+lOIxfgWmZ2gz33u2nbJ5TCTGJYyxbkaYXXLKo8JW2GtcCZchmhw4kUzo0rfRIXI80e4FEeh3Tj2X0518xp7m/SvKa2nE/dcye2a77ruJZJ0tzHqUmXZSMT5ZdOqgIxeqLGksNFK1mPUbMsfkxbCANVLp17CIeqUtiMYfOjzCuKc3GdYe8Mp47dQx824hnfEldJw9dWH8d+ELO64UsQnEIleQt+d2ASdFK0Vc2SmG7gxcFa2OU9V8TAWx/HKhBhW5KkMKUagATYLgbqzMRfgqslJFDJxB8fQ++Xlodq20MTt2TM9L89ilKyzmG/tNawR71l8+U/sxJS6/sVVXCzHLlMEyVnYRZMBeNwiW2ZBjM+mTv300vUS7+iNUOaZasPOMJqV3d4ImgRUMcOmExMDAnHCRGS10= Peter Palfrader - debian adm key (2008-05-11)
 # sgran
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAl6d3j4CiqkNNPv328Dy0zmWE8z8+pDvyRIpMk9wi2ojEmWvfv9spgUX/hUL0h9GXOjeuAJaSD45+GuWKNM0AKaa8KCdTOrKle1lpmH6Uk/tjZZwrR8ujMN95/XNpCc3/pZBnRBKOQhZr5+Du4v0ZtLp90EkgAXC11dGxaVe05O/RV1+Tix0WtUO+sBDmirMRjbk0ADCk6ANupKypNtMhlb8HP2OZA1QzrDtCc+yb/CQIOwMFIwFXrdX4P1Jsh8QG5YrO10wu8ckxC7lN1yiwJ92ISefAihk1n1/a1kMzvbCkyO7muGb4KuLPWspeZ31YhmeSiZe36sNNPMURrIfU/n0nuTtLR1OHZ87FIyuo/fTGNMnsIUgxxKZEuHz5PzrRsCpqRvMOrk4J30tjnWtcyYJAQknW8rDfa66wlMziyzJqRDJq96NmZwWpmHH4xTtecnX2s5p27sxNjzG2BKFvGziqPb3pqkzZUnys3dIQxSXfF42VwkWjHJJkRqLidVOrnedpvMMQuu+qcTKVtsA4nYAA+b6Qm4XPLqpR/esgji/pzE+0vG+H+cx7uZlobzZxKGoIoFAir514VtBr/rETAsTwlKHRa2DvN5suOGU1lO7RYGh/cQvDDOSHcamsbBeWYDYK0pqSojus7nwdn8FfNEThfkumWJOTD9dZEF20Lu0= sgran's Debian adm key (2009-08-02)
+
+<%= machine_keys = case fqdn
+   when "bartok.debian.org" then 
+     out = ''
+     keyinfo.keys.sort.each do |node|
+       out += '# ' + keyinfo[node][0]['hostname'].to_s + '
+command="/usr/lib/da-backup/da-backup-ssh-wrap ' + keyinfo[node][0]['hostname'].to_s + '",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="' + keyinfo[node][0]['ipHostNumber'].join(',') + '" ' + keyinfo[node][0]['sshRSAHostKey'].to_s + '
+
+'
+     end
+     out
+   end
+machine_keys
+%>