Prevent python from releasing locks prematurely

[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 0acc1b9..c98464c 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -10,10 +10,6 @@ class roles::static_mirror {
        apache2::module { 'rewrite': }
        apache2::module { 'expires': }
 
-       apache2::config { "local-static-vhost.conf":
-               source  => "puppet:///modules/roles/static-mirroring/static-vhost.conf",
-       }
-
        file { '/usr/local/bin/static-mirror-run':
                source => 'puppet:///modules/roles/static-mirroring/static-mirror-run',
                mode   => '0555',
@@ -35,12 +31,16 @@ class roles::static_mirror {
                default => '*:80',
        }
 
+       apache2::config { "local-static-vhost.conf":
+               content => template('roles/static-mirroring/static-vhost.conf.erb'),
+       }
+
        apache2::site { '010-planet.debian.org':
                site    => 'planet.debian.org',
                content => template('roles/static-mirroring/vhost/planet.debian.org.erb'),
        }
 
-       apache2::site { '10-static-vhosts-simple':
+       apache2::site { '010-static-vhosts-simple':
                site => "static-vhosts-simple",
                content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
        }