Have www on the static mirrors

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index c73e69fb40afad42f42e165f386bd1331f7f1d17..240a6bf0d2f0af9b86d9926de505f3e729a243de 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -45,4 +45,10 @@ class roles::static_mirror {
                site => "static-vhosts-simple",
                content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
        }
+
+       $wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur'
+       apache2::site { '010-www.debian.org':
+               site   => 'www.debian.org',
+               content => template('roles/apache-www.debian.org.erb'),
+       }
 }

diff --git a/modules/roles/manifests/www_mirror.pp b/modules/roles/manifests/www_mirror.pp
index ab14f02b3fd0a76af0defd94241c2daf01bc1d8c..8764e58a344bcae8959570f9e26fb028ce7e8198 100644 (file)
--- a/modules/roles/manifests/www_mirror.pp
+++ b/modules/roles/manifests/www_mirror.pp
@@ -1,7 +1,7 @@
 class roles::www_mirror {
+       # see also static mirrors.
 
        $wwwdo_document_root = '/srv/www.debian.org/www'
-
        apache2::site { '010-www.debian.org':
                site   => 'www.debian.org',
                content => template('roles/apache-www.debian.org.erb'),