Add www-staging vhost

[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 856721c..bc37aa8 100644 (file)
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -1,6 +1,18 @@
 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,
+       }
 
+       $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,
+       }
 }