X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fwww_master.pp;h=cce03387064c98458900e7db4cecdb1e28058464;hb=accfb8fd412b17c2b61f9ab1173aad720c8ffd61;hp=856721ce202553d4d562ad9de5746b2eb8d68499;hpb=ec38f656b0fd3fc68322b4da9c22c767d77f7303;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/www_master.pp b/modules/roles/manifests/www_master.pp
index 856721ce2..cce033870 100644
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -1,6 +1,21 @@
 class roles::www_master {
-		rsync::site { 'www_master':
-			source => 'puppet:///modules/roles/www_master/rsyncd.conf',
-		}
+	ssl::service { 'www-master.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,
+	}
 }