From: Peter Palfrader Date: Mon, 17 Dec 2012 13:32:46 +0000 (+0100) Subject: Re-order manifest X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f9367a72e7c03c652700668e10c7314ee1bd4124;hp=c5c3b36a0c3421802e8a62aae76a2604a29d1dd1;p=dsa-puppet.git Re-order manifest --- diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index 88d105b0..cc9b2106 100644 --- 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": - content => template('roles/static-mirroring/static-vhost.conf.erb'), - } - file { '/usr/local/bin/static-mirror-run': source => 'puppet:///modules/roles/static-mirroring/static-mirror-run', mode => '0555', @@ -35,6 +31,10 @@ 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'),