X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fwww_master.pp;h=737c1979e61c526cd0d5ca51b7839107562c6ca4;hb=58c7800d8ae435a2dbcabaabacddb0882c87307f;hp=40937028b68b7f57cbb94c9cd7e87bd5d964e5b7;hpb=02a676416dddafb10f13902b316b6a581c57b1e9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/www_master.pp b/modules/roles/manifests/www_master.pp
index 40937028b..737c1979e 100644
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -1,20 +1,23 @@
 class roles::www_master {
-	ssl::service { 'www-master.debian.org':
-		notify  => Exec['service apache2 reload'],
-		key => true,
-	}
+  include apache2
 
-	$vhost_listen = '*:80'
-	$vhost_listen_443 = '*:443'
-	$wwwdo_server_name = 'www-staging.debian.org'
-	$wwwdo_document_root = '/srv/www.debian.org/www'
-	apache2::site { '005-www-staging.debian.org':
-		site    => 'www-staging.debian.org',
-		content => template('roles/apache-www.debian.org.erb'),
-	}
+  ssl::service { 'www-master.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 
-	ssl::service { 'www-staging.debian.org' :
-		notify => Exec['service apache2 reload'],
-		key    => true,
-	}
+  $vhost_listen = '*:80'
+  $vhost_listen_443 = '*:443'
+  $redirect_vhosts = false
+  $wwwdo_server_name = 'www-staging.debian.org'
+  $wwwdo_document_root = '/srv/www.debian.org/www'
+  apache2::site { '005-www-staging.debian.org':
+    site    => 'www-staging.debian.org',
+    content => template('roles/apache-www.debian.org.erb'),
+  }
+
+  ssl::service { 'www-staging.debian.org' :
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 }