add www.backports.org redirect on all backports hosts

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 (file)
index 0000000..9bf9a2c
--- /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.
+
+<VirtualHost *:80>
+       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
+
+       <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/apache2/manifests/backports_mirror.pp b/modules/apache2/manifests/backports_mirror.pp
index dbdc6cf..615d050 100644 (file)
--- 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 {