newline

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

diff --git a/modules/roles/manifests/www_mirror.pp b/modules/roles/manifests/www_mirror.pp
index 5baa006041089966866ef6fbd896f5f95279277c..5d6a2f49b8c22e438c32cccaf53815fc2f27831d 100644 (file)
--- a/modules/roles/manifests/www_mirror.pp
+++ b/modules/roles/manifests/www_mirror.pp
@@ -1,11 +1,15 @@
 class roles::www_mirror {
+       # see also static mirrors.
 
-       apache2::site { '010-www.debian.org':
+       $wwwdo_document_root = '/srv/www.debian.org/www'
+       $vhost_listen = '*:80'
+       $vhost_listen_443 = '*:443'
+       apache2::site { '005-www.debian.org':
                site   => 'www.debian.org',
-               config => 'puppet:///modules/roles/www_mirror/www.debian.org',
+               content => template('roles/apache-www.debian.org.erb'),
        }
 
-       apache2::site { 'www.debian.org':
-               ensure => absent,
+       ssl::service { 'www.debian.org':
+               notify => Service['apache2'],
        }
 }