From 22da90629d012e623abc61a5ee061e4627e89125 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Wed, 22 Dec 2010 09:33:54 +0000 Subject: [PATCH] remove bartok Signed-off-by: Stephen Gran --- manifests/site.pp | 4 ++-- modules/debian-org/misc/local.yaml | 2 -- modules/ferm/templates/me.conf.erb | 4 ++-- modules/ssh/templates/authorized_keys.erb | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 4594a12c7..2a2746299 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -93,7 +93,7 @@ node default { case $hostname { klecker,ravel,senfl,orff,draghi: { include named::authoritative } geo1,geo2,geo3: { include named::geodns } - bartok,franck,liszt,master,samosa,schein,spohr,steffani,widor: { include named::recursor } + franck,liszt,master,samosa,schein,spohr,steffani,widor: { include named::recursor } } case $kernel { @@ -125,7 +125,7 @@ node default { byrd,schuetz: { include krb } - bartok,draghi,quantz,samosa: { + draghi,quantz,samosa: { include krb include afs } diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index d8dd74534..211a522f4 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -13,7 +13,6 @@ nameinfo: arne.debian.org: Thomas Augustine Arne (1710 - 1778) arnold.debian.org: Malcolm Henry Arnold (1921 - 2006) barber.debian.org: Samuel Barber (March 9th, 1910 - January 23rd, 1981) - bartok.debian.org: Béla Viktor János Bartók (March 25th, 1881 - September 26th, 1945) beethoven.debian.org: Ludwig van Beethoven (December 16th, 1770 - March 26th, 1827) bellini.debian.org: Vincenzo Salvatore Carmelo Francesco Bellini (November 3rd, 1801 - September 23rd, 1835) biber.debian.org: Heinrich Ignaz Franz von Biber (August 12th, 1664 - May 3rd, 1704) @@ -247,7 +246,6 @@ host_settings: arnold.debian.org: mailout.debian.org ball.debian.org: mailout.debian.org barber.debian.org: mailout.debian.org - bartok.debian.org: mailout.debian.org beethoven.debian.org: mailout.debian.org biber.debian.org: mailout.debian.org brahms.debian.org: mailout.debian.org diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index b88d974ae..f2f13a3b4 100644 --- a/modules/ferm/templates/me.conf.erb +++ b/modules/ferm/templates/me.conf.erb @@ -6,7 +6,7 @@ <%= out = [] -restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel lotti} +restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 beethoven tchaikovsky schroeder heininen handel lotti} ssh4allowed = [] ssh6allowed = [] @@ -23,7 +23,7 @@ if %w{lebrun schroeder}.include?(hostname) then ssh4allowed << '70.103.162.29' # master ssh4allowed << '82.195.75.84' # nott.ayous.org, HE (builddadm) end -if %w{bartok beethoven}.include?(hostname) then +if %w{beethoven}.include?(hostname) then ssh4allowed << '$HOST_DEBIAN_V4' ssh6allowed << '$HOST_DEBIAN_V6' end diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb index 039530aa2..2d9915211 100644 --- a/modules/ssh/templates/authorized_keys.erb +++ b/modules/ssh/templates/authorized_keys.erb @@ -36,7 +36,7 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAqtZYwCwuLP2KZOfqdRyKbexfhcfEiwY7en7aYmY7eUxa ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAuGJnElqbhgLtmJp/de8s42cAwKrkAhFq5u8EAkauEv6BZNqvY/6aRBxCNU55e5JZKa7D1qKMG0upZFCOl5K36uv0KXlCvIMgaQqQcce41dtNRmiyHpw3LXqdV2qJNpJAXMpsEN4F/STkftTOcFhI9nhz88IIwsboCErla1W8NxxRkBU0FxpT4Zn1wBlq30o12gtBFs3lO+nE7+k8H8I791V+3kjVAXCDh5Ep8BY4Bg8eSuhwUgmiNvWf6E6/D0s9pFJdAMFKFLPivsnc13nfgYDmxZQKrkVV8LqIGaisy7Q3LdQLKBraWYmfQ5idkaPK+EUSERdusG7pB0wzp1ieA1iEkgMRFFLBx22tQmEdmu+Wo3vM77FmNYWvvPKDwKYn1uwg0Kgf1JTWlFwq5C73EG3Q6Vb6ExNPaX/GMDkpi0Km5p2/BIM/jyCmCH+ScFRCtzJoxEg3L7BFdCKgY1bQW2pZDMRQ9nc32+EDUGQQbYp44/8mr4mXqDYV4VElZTqWZ6hJZk1cS7hustO8lJE3Yykp+q/5I0cq7fxe5aLBO5DwTPq9EY/dlcTy8z09Itm/AcJuCipg4I0nQ1cSDTNYn+4NVxoga/yS3gJlU5euXKmcaK9SaRCBIHtWR/Semza3Imvgtgd25bwKI+6VT/fHgqgmvo184NZID099w2E90eE= sgran's root key for debian.org machines <%= machine_keys = case fqdn - when "bartok.debian.org", "beethoven.debian.org" then + when "beethoven.debian.org" then out = '' keyinfo.keys.sort.each do |node| out += '# ' + keyinfo[node]['hostname'].to_s + ' -- 2.20.1