appstream 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 aa3e69c433194e4275abcc874e26eca4d66659c7..be25b5bd86a702f104b490e862d0a56140fb3896 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -6,7 +6,6 @@ class roles::static_mirror {
        package { 'libapache2-mod-geoip': ensure => installed, }
        package { 'geoip-database': ensure => installed, }
 
-       apache2::module { 'rewrite': }
        apache2::module { 'include': }
        apache2::module { 'ssl': }
        apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
@@ -16,6 +15,11 @@ class roles::static_mirror {
                mode   => '0555',
        }
 
+       file { '/usr/local/bin/static-mirror-run-all':
+               source => 'puppet:///modules/roles/static-mirroring/static-mirror-run-all',
+               mode   => '0555',
+       }
+
        file { '/srv/static.debian.org':
                ensure => directory,
                owner  => staticsync,
@@ -24,7 +28,7 @@ class roles::static_mirror {
        }
 
        file { '/etc/cron.d/puppet-static-mirror':
-                       content => "PATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; awk '!/^ *(#|$)/ {print \$1, \$2}' /etc/static-components.conf | while read master component; do static-mirror-run --one-stage /srv/static.debian.org/mirrors/\$component \"\$master:\$component/-live-\" > /dev/null; done\n",
+                       content => "MAILTO=root\nPATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; chronic static-mirror-run-all\n",
        }
 
        $vhost_listen = $::hostname ? {
@@ -45,6 +49,11 @@ 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'),
@@ -62,7 +71,16 @@ class roles::static_mirror {
        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'],
        }
+       ssl::service { 'appstream.debian.org':
+               notify => Service['apache2'],
+       }
 }