From 86c71f964fa076de61cd04acd503ff78f9912fa9 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 12 Apr 2016 17:29:01 +0200 Subject: [PATCH] re-order entries --- .../vhost/static-vhosts-simple.erb | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb index 7784d045b..009ea5f60 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -1,5 +1,16 @@ # puppet maintained +###################### +# deb.debian.org +<% if scope.function_has_static_component(['deb.debian.org']) -%> + + RedirectPermanent /debian/ http://cdn-fastly.deb.debian.org/debian/ + RedirectPermanent /debian-debug/ http://cdn-fastly.deb.debian.org/debian-debug/ + RedirectPermanent /debian-security/ http://cdn-fastly.deb.debian.org/debian-security/ + +<% end -%> + + <%= def vhost(lines, sn, type=nil, extra=nil) @@ -49,17 +60,6 @@ vhost(lines, "deb.debian.org", "with-extra", '"Use vhost-deb.debian.org-extra"') lines.join("\n") -%> - -###################### -# deb.debian.org -<% if scope.function_has_static_component(['deb.debian.org']) -%> - - RedirectPermanent /debian/ http://cdn-fastly.deb.debian.org/debian/ - RedirectPermanent /debian-debug/ http://cdn-fastly.deb.debian.org/debian-debug/ - RedirectPermanent /debian-security/ http://cdn-fastly.deb.debian.org/debian-security/ - -<% end -%> - ###################### # metadata.ftp-master.debian.org <% if scope.function_has_static_component(['metadata.ftp-master.debian.org']) -%> -- 2.20.1