From 6c89b952e2db008578761e06a2f2a517ce50cb4e Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 9 Apr 2013 10:50:09 +0200 Subject: [PATCH] backports cleanup --- modules/debian-org/misc/local.yaml | 5 ---- .../roles/files/backports_master/rsyncd.conf | 21 -------------- .../backports_mirror/backports.debian.org | 23 --------------- .../files/backports_mirror/www.backports.org | 28 ------------------- modules/roles/manifests/backports_master.pp | 17 ----------- modules/roles/manifests/backports_mirror.pp | 14 ---------- modules/roles/manifests/init.pp | 9 ------ 7 files changed, 117 deletions(-) delete mode 100644 modules/roles/files/backports_master/rsyncd.conf delete mode 100644 modules/roles/files/backports_mirror/backports.debian.org delete mode 100644 modules/roles/files/backports_mirror/www.backports.org delete mode 100644 modules/roles/manifests/backports_master.pp delete mode 100644 modules/roles/manifests/backports_mirror.pp diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index cb8542c8..cdc56c2a 100644 --- 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 index ed79313e..00000000 --- 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 index 90a7ebd8..00000000 --- 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 -## - - - 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 - - - UserDir disabled - - - Alias /debian-backports /srv/mirrors/backports.debian.org/ - - RewriteEngine On - RewriteRule ^/debian-backports($|/.*) - [L] - RewriteRule ^/(.*) http://backports-master.debian.org/$1 [R] - -# 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 index 96609e15..00000000 --- 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. - - - 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 - - - UserDir disabled - - - 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/ - -# vim:set syn=apache: - diff --git a/modules/roles/manifests/backports_master.pp b/modules/roles/manifests/backports_master.pp deleted file mode 100644 index a6c85737..00000000 --- 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 index 90ba66b1..00000000 --- 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 aaeacee6..b837c61f 100644 --- 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 -- 2.39.2