X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fwww_mirror.pp;h=e3b14124b7aac33d5e58f2fd4fde6b78e9059e5b;hb=46c07fe6439fb40dc9bfcbe3a20aa9bb2030396a;hp=5baa006041089966866ef6fbd896f5f95279277c;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

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