The debian-backports repository is obsolete. Remove from autofs and rsync/syncproxy...

diff --git a/modules/autofs/files/bytemark/auto.dsa b/modules/autofs/files/bytemark/auto.dsa
index 5344b29..b12db18 100644 (file)
--- a/modules/autofs/files/bytemark/auto.dsa
+++ b/modules/autofs/files/bytemark/auto.dsa
@@ -1,4 +1,3 @@
 debian                  -fstype=nfs,ro,tcp     172.29.122.2:/srv/mirrors/debian
-debian-backports        -fstype=nfs,ro,tcp     172.29.122.2:/srv/mirrors/debian-backports
 debian-debug            -fstype=nfs,ro,tcp     172.29.122.2:/srv/mirrors/debian-debug
 debian-security         -fstype=nfs,ro,tcp     172.29.122.2:/srv/mirrors/debian-security

diff --git a/modules/autofs/manifests/bytemark.pp b/modules/autofs/manifests/bytemark.pp
index 2750ccf..027384f 100644 (file)
--- a/modules/autofs/manifests/bytemark.pp
+++ b/modules/autofs/manifests/bytemark.pp
@@ -12,7 +12,7 @@ class autofs::bytemark {
 
        file { '/srv/mirrors': ensure  => directory }
        file { '/srv/mirrors/debian': ensure  => '/auto.dsa/debian' }
-       file { '/srv/mirrors/debian-backports': ensure  => '/auto.dsa/debian-backports' }
+       file { '/srv/mirrors/debian-backports': ensure  => absent }
        file { '/srv/mirrors/debian-debug': ensure  => '/auto.dsa/debian-debug' }
        file { '/srv/mirrors/debian-security': ensure  => '/auto.dsa/debian-security' }
 }

diff --git a/modules/debian-org/lib/facter/paths.rb b/modules/debian-org/lib/facter/paths.rb
index a330c30..6b1b3da 100644 (file)
--- a/modules/debian-org/lib/facter/paths.rb
+++ b/modules/debian-org/lib/facter/paths.rb
@@ -3,7 +3,6 @@
    /srv/buildd
    /etc/ssh/ssh_host_ed25519_key
    /srv/mirrors/debian
-   /srv/mirrors/debian-backports
    /srv/mirrors/debian-debug
    /srv/mirrors/debian-security
    /dev/hwrng

diff --git a/modules/roles/files/dakmaster/rsyncd.conf b/modules/roles/files/dakmaster/rsyncd.conf
index 6f67db9..23b74f8 100644 (file)
--- a/modules/roles/files/dakmaster/rsyncd.conf
+++ b/modules/roles/files/dakmaster/rsyncd.conf
@@ -20,14 +20,6 @@ log file = /var/log/rsyncd/rsyncd.log
   read only = true
   secrets file = /etc/rsyncd/ftp.secrets
 
-[debian-backports]
-  path = /srv/backports-master.debian.org/mirror/backports
-  comment = Debian Squeeze Backports
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/backports.secrets
-  list = no
-
 [debian-debug]
   path = /srv/ftp-master.debian.org/mirror/debian-debug
   comment = Debug packages.  Probably large.  Starting mid 2015.

diff --git a/modules/roles/templates/syncproxy/rsyncd.conf.erb b/modules/roles/templates/syncproxy/rsyncd.conf.erb
index ef7e962..dd348e4 100644 (file)
--- a/modules/roles/templates/syncproxy/rsyncd.conf.erb
+++ b/modules/roles/templates/syncproxy/rsyncd.conf.erb
@@ -18,16 +18,6 @@ log file =  /var/log/rsyncd/rsyncd-syncproxy.log
   read only = true
   secrets file = /etc/rsyncd/debian.secrets
 
-[debian-backports]
-  path = /srv/mirrors/debian-backports/
-<%- unless has_variable?("has_srv_mirrors_debian_backports") && has_srv_mirrors_debian_backports == "true" -%>
-  list = no
-<%- end -%>
-  comment = Debian backports archive (up to, including Debian 6.0(squeeze) - ~35 GB; contact mirrors@debian.org for access)
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/debian.secrets
-
 [debian-debug]
   path = /srv/mirrors/debian-debug/
 <%- unless has_variable?("has_srv_mirrors_debian_debug") && has_srv_mirrors_debian_debug == "true" -%>

diff --git a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
index 9367e8e..fa910c1 100644 (file)
--- a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
+++ b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
@@ -25,7 +25,7 @@ Use common-debian-service-https-redirect "<%= vhost_listen %>" <%= syncproxy_nam
 
 <%=
 lines = []
-%w{debian debian-backports debian-debug debian-security}.each do |archive|
+%w{debian debian-debug debian-security}.each do |archive|
   varname = 'has_srv_mirrors_' + archive.gsub(/[\/-]/,'_')
   if has_variable?(varname) and (eval(varname)) == 'true'
     lines << "  Alias /#{archive}/project/trace/ /srv/mirrors/#{archive}/project/trace/"

diff --git a/modules/roles/templates/syncproxy/syncproxy.debian.org-index.html.erb b/modules/roles/templates/syncproxy/syncproxy.debian.org-index.html.erb
index a3e0070..f1be122 100644 (file)
--- a/modules/roles/templates/syncproxy/syncproxy.debian.org-index.html.erb
+++ b/modules/roles/templates/syncproxy/syncproxy.debian.org-index.html.erb
@@ -18,7 +18,7 @@ This syncproxy contains copies of the following archives.
 <ul>
 <%=
 lines = []
-%w{debian debian-backports debian-debug debian-security}.each do |archive|
+%w{debian debian-debug debian-security}.each do |archive|
   varname = 'has_srv_mirrors_' + archive.gsub(/[\/-]/,'_')
   if has_variable?(varname) and (eval(varname)) == 'true'
     lines << "<li>#{archive} [<a href=\"/#{archive}/project/trace/\">trace directory</a>]</li>"