re-order entries
authorPeter Palfrader <peter@palfrader.org>
Tue, 12 Apr 2016 15:29:01 +0000 (17:29 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 12 Apr 2016 15:29:01 +0000 (17:29 +0200)
modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb

index 7784d04..009ea5f 100644 (file)
@@ -1,5 +1,16 @@
 # puppet maintained
 
+######################
+# deb.debian.org
+<% if scope.function_has_static_component(['deb.debian.org']) -%>
+<Macro vhost-deb.debian.org-extra>
+       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/
+</Macro>
+<% 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']) -%>
-<Macro vhost-deb.debian.org-extra>
-       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/
-</Macro>
-<% end -%>
-
 ######################
 # metadata.ftp-master.debian.org
 <% if scope.function_has_static_component(['metadata.ftp-master.debian.org']) -%>