Merge branch 'new-ssl'

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

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 9c4b93b007dd1d4b66ad93886fa06fdbf771237b..3a614a93ea02cf4114af619a63122fe4884567da 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -3,13 +3,11 @@ class roles::static_mirror {
        include roles::static_source
        include apache2::cache
 
-       package { 'libapache2-mod-macro': ensure => installed, }
        package { 'libapache2-mod-geoip': ensure => installed, }
        package { 'geoip-database': ensure => installed, }
 
-       apache2::module { 'macro': require => Package['libapache2-mod-macro']; }
-       apache2::module { 'rewrite': }
        apache2::module { 'include': }
+       apache2::module { 'ssl': }
        apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
 
        file { '/usr/local/bin/static-mirror-run':
@@ -32,6 +30,10 @@ class roles::static_mirror {
                klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
                default => '*:80',
        }
+       $vhost_listen_443 = $::hostname ? {
+               klecker => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443',
+               default => '*:443',
+       }
 
        apache2::config { 'local-static-vhost.conf':
                content => template('roles/static-mirroring/static-vhost.conf.erb'),
@@ -42,14 +44,35 @@ class roles::static_mirror {
                content => template('roles/static-mirroring/vhost/planet.debian.org.erb'),
        }
 
+       apache2::site { '010-lintian.debian.org':
+               site    => 'lintian.debian.org',
+               content => template('roles/static-mirroring/vhost/lintian.debian.org.erb'),
+       }
+
        apache2::site { '010-static-vhosts-simple':
                site => 'static-vhosts-simple',
                content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
        }
 
        $wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur'
-       apache2::site { '010-www.debian.org':
+       apache2::site { '005-www.debian.org':
                site   => 'www.debian.org',
                content => template('roles/apache-www.debian.org.erb'),
        }
+
+       ssl::service { 'dsa.debian.org':
+               notify => Service['apache2'],
+       }
+       ssl::service { 'www.debian.org':
+               notify => Service['apache2'],
+       }
+       ssl::service { 'bits.debian.org':
+               notify => Service['apache2'],
+       }
+       ssl::service { 'lintian.debian.org':
+               notify => Service['apache2'],
+       }
+       ssl::service { 'rtc.debian.org':
+               notify => Service['apache2'],
+       }
 }