From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 26 Apr 2013 09:34:16 +0000 (+0200)
Subject: Have www on the static mirrors
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8368310b0e5a5193c5703404f1390fd5c18066ff;p=dsa-puppet.git

Have www on the static mirrors
---

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index c73e69fb..240a6bf0 100644
--- 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 ab14f02b..8764e58a 100644
--- 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'),