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 3a614a93ea02cf4114af619a63122fe4884567da..be25b5bd86a702f104b490e862d0a56140fb3896 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -15,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,
@@ -23,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 ? {
@@ -75,4 +80,7 @@ class roles::static_mirror {
        ssl::service { 'rtc.debian.org':
                notify => Service['apache2'],
        }
+       ssl::service { 'appstream.debian.org':
+               notify => Service['apache2'],
+       }
 }