From 657d0787c147515f5c6ac67d47e719db9b167532 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 19 Sep 2011 08:45:42 +0200 Subject: [PATCH] add www.backports.org redirect on all backports hosts --- .../apache2/sites-available/www.backports.org | 27 +++++++++++++++++++ modules/apache2/manifests/backports_mirror.pp | 4 +++ 2 files changed, 31 insertions(+) create mode 100644 modules/apache2/files/common/etc/apache2/sites-available/www.backports.org diff --git a/modules/apache2/files/common/etc/apache2/sites-available/www.backports.org b/modules/apache2/files/common/etc/apache2/sites-available/www.backports.org new file mode 100644 index 000000000..9bf9a2c4e --- /dev/null +++ b/modules/apache2/files/common/etc/apache2/sites-available/www.backports.org @@ -0,0 +1,27 @@ +## +## 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 + ServerAdmin debian-admin@debian.org + + ErrorLog /var/log/apache2/www.backports.org-error.log + CustomLog /var/log/apache2/www.backports.org-access.log combined + + + 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/apache2/manifests/backports_mirror.pp b/modules/apache2/manifests/backports_mirror.pp index dbdc6cfd9..615d050eb 100644 --- a/modules/apache2/manifests/backports_mirror.pp +++ b/modules/apache2/manifests/backports_mirror.pp @@ -3,11 +3,15 @@ class apache2::backports_mirror inherits apache2 { "/etc/apache2/sites-available/backports.debian.org": source => [ "puppet:///modules/apache2/per-host/$fqdn/etc/apache2/sites-available/backports.debian.org", "puppet:///modules/apache2/common/etc/apache2/sites-available/backports.debian.org" ]; + "/etc/apache2/sites-available/www.backports.org": + source => [ "puppet:///modules/apache2/per-host/$fqdn/etc/apache2/sites-available/www.backports.org", + "puppet:///modules/apache2/common/etc/apache2/sites-available/www.backports.org" ]; } activate_apache_site { "010-backports.debian.org": site => "backports.debian.org"; + "010-www.backports.org": site => "www.backports.org"; } enable_module { -- 2.20.1