X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fwww_mirror.pp;h=5d6a2f49b8c22e438c32cccaf53815fc2f27831d;hb=e34c76faa5ee33d46508e353a2e426c60553fb0c;hp=f898208068ade94ca0b5bca290018f7187c33e38;hpb=3742b5bd8462115178af572f80ed3e116d8c9041;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/www_mirror.pp b/modules/roles/manifests/www_mirror.pp
index f89820806..5d6a2f49b 100644
--- a/modules/roles/manifests/www_mirror.pp
+++ b/modules/roles/manifests/www_mirror.pp
@@ -1,7 +1,15 @@
 class roles::www_mirror {
+	# see also static mirrors.
 
-	apache2::site { '010-www.debian.org':
+	$wwwdo_document_root = '/srv/www.debian.org/www'
+	$vhost_listen = '*:80'
+	$vhost_listen_443 = '*:443'
+	apache2::site { '005-www.debian.org':
 		site   => 'www.debian.org',
-		config => 'puppet:///modules/roles/www_mirror/www.debian.org',
+		content => template('roles/apache-www.debian.org.erb'),
+	}
+
+	ssl::service { 'www.debian.org':
+		notify => Service['apache2'],
 	}
 }