Drop apt.buildd.debian.org

We do not use it since none of our buildds are running jessie

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index fd94870..b113b6b 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -96,7 +96,6 @@ class roles::static_mirror {
 
        # do
        ssl::service { 'appstream.debian.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
-       ssl::service { 'apt.buildd.debian.org'         : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
        ssl::service { 'backports.debian.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
        ssl::service { 'bits.debian.org'               : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
        ssl::service { 'blends.debian.org'             : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
@@ -173,7 +172,6 @@ class roles::static_mirror {
 
                # do
                onion::service { 'appstream.debian.org'          : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
-               onion::service { 'apt.buildd.debian.org'         : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
                onion::service { 'backports.debian.org'          : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
                onion::service { 'bits.debian.org'               : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
                onion::service { 'blends.debian.org'             : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index 8b3025e..81a07a1 100644 (file)
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -96,10 +96,6 @@ components:
   onion.debian.org:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/onion-master.debian.org/htdocs
-  apt.buildd.debian.org:
-    master: dillon.debian.org
-    source: wuiet.debian.org:/srv/buildd.debian.org/ftp-archive/archive
-    limit-mirrors: [ 'klecker.debian.org', 'senfter.debian.org' ]
   cdbuilder-logs.debian.org:
     master: dillon.debian.org
     source: casulana.debian.org:/srv/cdbuilder.debian.org/dst/deb-cd/log

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 31c78f7..2107a36 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -268,7 +268,6 @@ vhost(lines, "wnpp-by-tags.debian.net"       , :ssl => true)
 vhost(lines, "security-team.debian.org"      , :ssl => true)
 vhost(lines, "d-i.debian.org"                , :ssl => true)
 vhost(lines, "appstream.debian.org"          , :ssl => true)
-vhost(lines, "apt.buildd.debian.org"         , :ssl => true)
 vhost(lines, "dpl.debian.org"                , :ssl => true)
 vhost(lines, "dsa.debian.org"                , :ssl => true)
 vhost(lines, "rtc.debian.org"                , :ssl => true)

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 38d22c8..f1c1470 100644 (file)
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -248,7 +248,6 @@ pabs                dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component time
 %debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component wiki.debconf.org
 %debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component www.debconf.org
 mini-dak       porta=(staticsync)              NOPASSWD: /usr/local/bin/static-update-component incoming.ports.debian.org
-%wbadm         wuiet=(staticsync)              NOPASSWD: /usr/local/bin/static-update-component apt.buildd.debian.org
 %manpages      manziarly=(staticsync)          NOPASSWD: /usr/local/bin/static-update-component manpages.debian.org
 %dpl           dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component dpl.debian.org