From: Luca Filipozzi Date: Sat, 31 May 2014 09:10:00 +0000 (+0000) Subject: purging orff X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=84d1e7a9c1728b78c3bca11e8a5505222c3b74ac purging orff --- diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 51ecbef6..002357db 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -27,7 +27,6 @@ roles: - geo3.debian.org extranrpeclient: - denis.debian.org - - orff.debian.org ftp.d.o: - klecker.debian.org ftp_master: diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index fd2364c2..a32a751a 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -80,7 +80,6 @@ nameinfo: mundy.debian.org: William Mundy (c. 1529 - 1591) nielsen.debian.org: Carl August Nielsen (June 9th, 1865 - October 3rd, 1931) nono.debian.org: Luigi Nono (January 29th, 1924 - May 8th, 1990) - orff.debian.org: Carl Orff (July 10th, 1895 - March 29th, 1982) oyens.debian.org: Tera de Marez Oyens (August 5th, 1932 - August 29th, 1996) parry.debian.org: Sir Charles Hubert Hastings Parry, 1st Baronet (February 27th, 1848 – October 7th, 1918) partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974) diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb index 12359ed5..6771c1be 100644 --- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb +++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb @@ -7,7 +7,6 @@ ignore = [] case fqdn when /draghi.debian.org/ then ignore << %w{userdir-ldap userdir-ldap-cgi libheimdal-kadm5-perl django-ldapdb ud python-cdb python-nameparser} -when /orff.debian.org/ then ignore << %w{libnet-dns-sec-perl libnet-dns-zone-parser-perl} when /(zandonai|zelenka).debian.org/ then ignore << %w{samhain zabbix-agent rrdcollect} when /zappa.debian.org/ then ignore << %w{samhain} when /(mayer|corelli).debian.org/ then ignore << "linux-base" diff --git a/modules/named/files/common/authorized_keys b/modules/named/files/common/authorized_keys index c7d76be5..936f3aca 100644 --- a/modules/named/files/common/authorized_keys +++ b/modules/named/files/common/authorized_keys @@ -2,5 +2,4 @@ # 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 # -from="194.177.211.209,2001:648:2ffc:deb:213:72ff:fe69:e188",command="/etc/bind/geodns/trigger",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2cJCkmggW6TD0UPJP9lelDno8qbYGXPeYE4+QmkqJv8mslcHxmx5tA2TvpJ9qbAUMPOdZf9ihomwPmFzz9UNZH4eDA8F126UUP5DXsh7FC7yVGSBUNdJdYS7m2wtVs8ddhrVdI+8c39D7NVGGjtUCJCWA/3fE65O183Gm+vER65SYR6LfHlEiC2FBROs6qwnjQ0yw194MnU7Jxl/GsTdZ72ArkmcPjuWsVHWtkSTt0hPfgBOyL4vSfBgl2p2eQBXCEPOaPTa1Yr5qfur1+Cj+iwadEmPfRap6rBO3wfIjbXt/KncM2uFrCXuF1TOqQxrs5LSe8dz16vf9Ckf9Ae5wQ== geodnssync@orff (20090527; until 20100907 @draghi) from="82.195.75.91,2001:41b8:202:deb:1b1b::91",command="/etc/bind/geodns/trigger",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtZqwdRGRGycqd+EqSzMfXHZa8caLx2yjkQs3hXOWDcAkfbFhsjgnVanx90i8/FIIIVKWPHXvRpS8dsKfBn4MbVq6AYYcx/sYS9uMMjLWFMC0TqrOp4IgHMH3qXlgsq/eOnqvQXDU3DO3p2TVS/a4F7vh8/nPQtDM1JVnMgZL4rx0aXYVcFIdxv9Sy76K4MBENOnXJ73qmRaVu6fIUfk9MAdzIcMx3iOYiO78vytc4xezq743iIOee0vpY1VnF2CDxrWoVyDGDH7qNk8xeFzAGm91xrcSkVEmMVbD9vMLOOPsEZNMJlimEDetEiNwJoS0HzHq6jccksb1wjs2tOr8X dnsadm@denis (20131230) diff --git a/modules/named/templates/named.conf.puppet-shared-keys.erb b/modules/named/templates/named.conf.puppet-shared-keys.erb index c954c662..14fc3640 100644 --- a/modules/named/templates/named.conf.puppet-shared-keys.erb +++ b/modules/named/templates/named.conf.puppet-shared-keys.erb @@ -6,7 +6,6 @@ <%= pairs = [ - [ 'denis.debian.org', 'orff.debian.org' ], [ 'denis.debian.org', 'geo1.debian.org' ], [ 'denis.debian.org', 'geo2.debian.org' ], [ 'denis.debian.org', 'geo3.debian.org' ] diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp index 0a0c14ce..bee691c3 100644 --- a/modules/ntp/manifests/client.pp +++ b/modules/ntp/manifests/client.pp @@ -22,9 +22,6 @@ class ntp::client { file { '/etc/ntp.keys.d/ntpkey_iff_luchesi': source => 'puppet:///modules/ntp/ntpkey_iff_luchesi.pub', } - file { '/etc/ntp.keys.d/ntpkey_iff_orff': - ensure => absent, - } file { '/etc/ntp.keys.d/ntpkey_iff_ravel': ensure => absent, } diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf index 8cc742a6..4885e571 100644 --- a/modules/ntp/templates/ntp.conf +++ b/modules/ntp/templates/ntp.conf @@ -22,10 +22,6 @@ server 2.debian.pool.ntp.org iburst dynamic server 3.debian.pool.ntp.org iburst dynamic leapfile /var/lib/ntp/leap-seconds.list -<% if fqdn == "orff.debian.org" -%> -server ntp.grnet.gr iburst dynamic -server chronos.duth.gr iburst -<% end -%> <% elsif fqdn == "ancina.debian.org" -%> server ntp.ugent.be iburst dynamic <% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%> diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index ce660572..18d092c9 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -29,7 +29,7 @@ Host_Alias FTPHOSTS = franck Host_Alias ZIVITHOSTS = zelenka, zandonai Host_Alias AACRAIDHOSTS = respighi, beethoven, pettersson Host_Alias MEGARAIDHOSTS = rautavaara, sibelius -Host_Alias MPTRAIDHOSTS = barber, biber, vitry, orff +Host_Alias MPTRAIDHOSTS = barber, biber, vitry Host_Alias MEGACTLHOSTS = nielsen Host_Alias LISTHOSTS = bendel Host_Alias BUILDD_MASTER = wuiet @@ -167,8 +167,6 @@ piupartss PIUPARTS_SLAVE_HOSTS=(ALL) NOPASSWD: ALL # trigger of mirror run for packages #pkg_user powell=(archvsync) NOPASSWD: /home/archvsync/bin/pushpdo dnsadm denis=(root) NOPASSWD: /usr/sbin/service bind9 reload -%dnsadm orff=(root) NOPASSWD: /etc/init.d/bind9 reload -%dnsadm orff=(geodnssync) NOPASSWD: /usr/bin/make -C /srv/dns.debian.org/geo %adm draghi=(puppet) NOPASSWD: /usr/bin/make -s -C /srv/db.debian.org/var/gitnagios/dsa-nagios/config install # wbadm can update all buildd* users' keys on buildd.d.o %wbadm BUILDD_MASTER=(wb-buildd) ALL