fix template name

[mirror/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 8dd1bb8..240a6bf 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -24,7 +24,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; static-mirror-run --one-stage /srv/static.debian.org bizet.debian.org:-live- > /dev/null\n",
+                       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",
        }
 
        $vhost_listen = $::hostname ? {
@@ -45,4 +45,10 @@ class roles::static_mirror {
                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':
+               site   => 'www.debian.org',
+               content => template('roles/apache-www.debian.org.erb'),
+       }
 }