backports cleanup

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index cb8542c..cdc56c2 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -150,8 +150,6 @@ footer:
   #zandonai.debian.org: "Debian s390 buildd system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
   #zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:
-  backports_master:
-    - morricone.debian.org
   bugsmaster:
   bugsmx:
     - busoni.debian.org
@@ -232,9 +230,6 @@ host_settings:
   'apache2_ftp-upcoming_mirror':
     - klecker.debian.org
     - rietz.debian.org
-  apache2_backports_mirror:
-    - englund.debian.org
-    - morricone.debian.org
   timeserver:
     - busoni.debian.org
     - merikanto.debian.org

diff --git a/modules/roles/files/backports_master/rsyncd.conf b/modules/roles/files/backports_master/rsyncd.conf
deleted file mode 100644 (file)
index ed79313..0000000
--- a/modules/roles/files/backports_master/rsyncd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-uid = nobody
-gid = nogroup
-max connections = 20
-syslog facility = daemon
-log file = /var/log/rsyncd/rsyncd.log
-socket options = SO_KEEPALIVE
-timeout = 7200
-
-[debian-backports]
-  path = /srv/backports-master.debian.org/mirror
-  comment = Debian backports archive
-  read only = true
-  auth users = *
-  secrets file = /etc/rsyncd/ftp.secrets
-
-[exports]
-  path = /srv/backports-web.debian.org/export
-  comment = Various metadata exports
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/exports.secrets

diff --git a/modules/roles/files/backports_mirror/backports.debian.org b/modules/roles/files/backports_mirror/backports.debian.org
deleted file mode 100644 (file)
index 90a7ebd..0000000
--- a/modules/roles/files/backports_mirror/backports.debian.org
+++ /dev/null
@@ -1,23 +0,0 @@
-##
-## 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
-##
-
-<VirtualHost *:80>
-       ServerName backports.debian.org
-       ServerAdmin debian-admin@debian.org
-
-       ErrorLog /var/log/apache2/backports.debian.org-error.log
-       CustomLog /var/log/apache2/backports.debian.org-access.log privacy
-
-       <IfModule mod_userdir.c>
-               UserDir disabled
-       </IfModule>
-
-       Alias /debian-backports /srv/mirrors/backports.debian.org/
-
-       RewriteEngine On
-       RewriteRule ^/debian-backports($|/.*)   -                                       [L]
-       RewriteRule ^/(.*)                      http://backports-master.debian.org/$1   [R]
-</VirtualHost>
-# vim:set syn=apache:

diff --git a/modules/roles/files/backports_mirror/www.backports.org b/modules/roles/files/backports_mirror/www.backports.org
deleted file mode 100644 (file)
index 96609e1..0000000
--- a/modules/roles/files/backports_mirror/www.backports.org
+++ /dev/null
@@ -1,28 +0,0 @@
-##
-## 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
-##
-
-# www.backports.org is the historical place for the backports
-# website and archive.  It is now a CNAME to backports.debian.org -
-# redirect http requests.
-
-<VirtualHost *:80>
-       ServerName www.backports.org
-       ServerAlias lists.backports.org
-       ServerAdmin debian-admin@debian.org
-
-       ErrorLog /var/log/apache2/www.backports.org-error.log
-       CustomLog /var/log/apache2/www.backports.org-access.log privacy
-
-       <IfModule mod_userdir.c>
-               UserDir disabled
-       </IfModule>
-
-       RedirectPermanent /debian/           http://backports.debian.org/debian-backports/
-       RedirectPermanent /backports.org/    http://backports.debian.org/debian-backports/
-       RedirectPermanent /debian-backports/ http://backports.debian.org/debian-backports/
-       RedirectPermanent / http://backports-master.debian.org/
-</VirtualHost>
-# vim:set syn=apache:
-

diff --git a/modules/roles/manifests/backports_master.pp b/modules/roles/manifests/backports_master.pp
deleted file mode 100644 (file)
index a6c8573..0000000
--- a/modules/roles/manifests/backports_master.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-class roles::backports_master {
-
-       include roles::backports_mirror
-
-       vsftpd::site { 'backports':
-               banner     => 'backports-master.debian.org FTP server',
-               logfile    => '/var/log/ftp/vsftpd-backports-master.debian.org.log',
-               writable   => true,
-               chown_user => dak-unpriv,
-               root       => '/srv/backports-upload',
-       }
-
-       rsync::site { 'backports_master':
-               source        => 'puppet:///modules/roles/backports_master/rsyncd.conf',
-               max_clients => 100,
-       }
-}

diff --git a/modules/roles/manifests/backports_mirror.pp b/modules/roles/manifests/backports_mirror.pp
deleted file mode 100644 (file)
index 90ba66b..0000000
--- a/modules/roles/manifests/backports_mirror.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class roles::backports_mirror {
-       apache2::site { '010-backports.debian.org':
-               site   => 'backports.debian.org',
-               source => 'puppet:///modules/roles/backports_mirror/backports.debian.org',
-       }
-
-       apache2::site { '010-www.backports.org':
-               site   => 'www.backports.org',
-               source => 'puppet:///modules/roles/backports_mirror/www.backports.org',
-       }
-
-       apache2::module { 'rewrite': }
-
-}

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index aaeacee..b837c61 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -33,10 +33,6 @@ class roles {
                include roles::www_mirror
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-               include roles::backports_mirror
-       }
-
        if getfromhash($site::nodeinfo, 'ftp.d.o') {
                include roles::ftp
        }
@@ -45,11 +41,6 @@ class roles {
                include roles::ftp_upload
        }
 
-       if getfromhash($site::nodeinfo, 'backports_master') {
-               include roles::backports_master
-               include roles::dakmaster
-       }
-
        if getfromhash($site::nodeinfo, 'security_master') {
                include roles::security_master
                include roles::dakmaster