Merge branch 'master' of git+ssh://git2.debian.org/dsa/dsa-puppet

diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml
index b3395d7..b03a0b7 100644 (file)
--- a/modules/debian_org/files/misc/local.yaml
+++ b/modules/debian_org/files/misc/local.yaml
@@ -11,7 +11,6 @@ nameinfo:
   bendel.debian.org: Franz Bendel (March 23rd, 1833 - July 3rd, 1874)
   binet.debian.org: Jocelyne Binet (September 27th, 1923 - January 13th, 1968)
   boott.debian.org: Francis Boott (June 24th, 1813 - March 1st, 1904)
-  busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1st, 1866 - July 27th, 1924)
   buxtehude.debian.org: Dieterich Buxtehude (c. 1637 to 1639 - May 9th, 1707)
   byrd.debian.org: William Byrd (1543 - July 4th, 1623)
   casulana.debian.org: Maddalena Casulana (c. 1544 - c. 1590)

diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index 9cee061..d75702c 100644 (file)
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -31,9 +31,6 @@ class ntp::client {
        file { '/etc/ntp.keys.d/ntpkey_iff_ravel':
                ensure => absent,
        }
-       file { '/etc/ntp.keys.d/ntpkey_iff_busoni':
-               ensure => absent,
-       }
        file { '/usr/local/sbin/ntp-restart-if-required':
                source => 'puppet:///modules/ntp/ntp-restart-if-required',
                mode    => '0555',

diff --git a/modules/onion/files/create-onionbalance-config b/modules/onion/files/create-onionbalance-config
index d0b97fb..fae6d76 100755 (executable)
--- a/modules/onion/files/create-onionbalance-config
+++ b/modules/onion/files/create-onionbalance-config
@@ -6,14 +6,8 @@
 # file that puppet puts together.
 # the input file looks like this:
 #  - service: www.debian.org
-#    address: jmri7yqqjpdxob4s
-#    name: busoni-www.debian.org
-#  - service: www.debian.org
 #    address: ufhzy7r7qfy2tmy3
 #    name: klecker-www.debian.org
-#  - service: www.ports.debian.org
-#    address: g32eridc6ocxni5w
-#    name: busoni-www.ports.debian.org
 # and so on.  This script collect together instances for the same
 # service name, creates a new key if none is present already, and
 # writes a new config.

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index fc2721f..c95d062 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -30,7 +30,6 @@ class roles::static_mirror {
        }
 
        $onion_v4_addr = $::hostname ? {
-               busoni     => '140.211.166.202',
                klecker    => '130.89.148.14',
                mirror-isc => '149.20.4.15',
                senfter    => '5.153.231.4',

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index 3d08e68..493c07c 100644 (file)
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -34,8 +34,6 @@ components:
   debdeltas.debian.net:
     master: dillon.debian.org
     source: donizetti.debian.org:/srv/debdelta.debian.org/www/debdeltas
-    exclude-mirrors:
-      - busoni.debian.org
   dpl.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/dpl.debian.org/htdocs