Retire backuphost

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index d644c23..09ce782 100644 (file)
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -41,7 +41,7 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAuGJnElqbhgLtmJp/de8s42cAwKrkAhFq5u8EAkauEv6B
 
 machine_keys = []
 case fqdn
-  when "backuphost.debian.org", "storace.debian.org" then
+  when "storace.debian.org" then
     roles['dabackup_client'].each do |node|
       if allnodeinfo.has_key?(node)
         hostname = allnodeinfo[node]['hostname'][0]

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 4859f95..9e9ac40 100644 (file)
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -75,7 +75,7 @@ nagios                AACRAIDHOSTS=(ALL)      NOPASSWD: /usr/local/bin/arcconf GETCONFIG 1 LD, /usr
 nagios         MEGARAIDHOSTS=(ALL)     NOPASSWD: /usr/local/bin/megarc -AllAdpInfo -nolog, /usr/local/bin/megarc -dispCfg -a0 -nolog
 nagios         MEGACTLHOSTS=(ALL)      NOPASSWD: /usr/sbin/megactl -Hv
 # other nagios things
-nagios         backuphost,storace=(debbackup)  NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backuppg ""
+nagios         storace=(debbackup)     NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backuppg ""
 
 # groups and their role accounts
 %auditor       ALL=(accounting)        ALL