X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fwww_master.pp;h=2b3419a583a5f7a53a0f18a205d5c39e48770a6a;hb=cef3eaddab26cf72e30b6cfe8d6e65e30176765e;hp=70fc5591c68b793b44f93b95495ac1cc7a55cc84;hpb=0b68381fd31eec6f60601df29d4cf0b137724fad;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/www_master.pp b/modules/roles/manifests/www_master.pp
index 70fc5591c..2b3419a58 100644
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -1,9 +1,29 @@
 class roles::www_master {
-	rsync::site { 'www_master':
-		source => 'puppet:///modules/roles/www_master/rsyncd.conf',
-	}
-	ssl::service { 'www-master.debian.org':
-		notify => Service['apache2'],
-		key => true,
-	}
+  include apache2
+
+  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,
+  }
+
+  exim::vdomain { 'www-master.debian.org':
+    owner   => 'debwww',
+    group   => 'debwww',
+    maildir => '/srv/www.debian.org/mail',
+  }
 }