Register manualroutes from the service class for the three services that had it hardc...

[mirror/dsa-puppet.git] / modules / roles / manifests / www_master.pp

diff --git a/modules/roles/manifests/www_master.pp b/modules/roles/manifests/www_master.pp
index cce0338..d8019a8 100644 (file)
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -1,21 +1,32 @@
 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'
-       $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-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',
+  }
 }