X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Fbackports_mirror.pp;h=47b2a2dc863cedf0ce606f820f1c361776022994;hb=f663f54583fe6542d5928cfce3ad29cd3672da3b;hp=dbdc6cfd93a2e29485690a48810298a7c5ea3bcd;hpb=aeb87d856bc91cf294ef070c4d85bd001b016cba;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/backports_mirror.pp b/modules/apache2/manifests/backports_mirror.pp
index dbdc6cfd9..47b2a2dc8 100644
--- a/modules/apache2/manifests/backports_mirror.pp
+++ b/modules/apache2/manifests/backports_mirror.pp
@@ -1,13 +1,18 @@
-class apache2::backports_mirror inherits apache2 {
+class apache2::backports_mirror {
+    include apache2
     file {
         "/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 {