X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fwww_master.pp;h=d8019a8918d209e7dd648a92be5425300c9b6562;hb=a7d417cca7d5ad27c47c2c4627dae06c74b20222;hp=bc37aa863708dfeb1729bdc1a2baea0f38346f81;hpb=e9c182207bf901dd7689986fc02e5c4e24c4553a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/www_master.pp b/modules/roles/manifests/www_master.pp
index bc37aa863..d8019a891 100644
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -1,18 +1,32 @@
 class roles::www_master {
-	ssl::service { 'www-master.debian.org':
-		notify  => Exec['service apache2 reload'],
-		key => true,
-	}
+  include apache2
 
-	$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,
+  }
+
+  # tell the mail-relays to forward this domain to us
+  exim::manualroute{ 'www-master.debian.org': }
+  # and then handle it locally
+  exim::vdomain { 'www-master.debian.org':
+    owner   => 'debwww',
+    group   => 'debwww',
+    maildir => '/srv/www.debian.org/mail',
+  }
 }