Replace the deb.d.o RedirectPermanent with plain Redirects

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb

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 48cb490..fef7303 100644 (file)
--- 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']) -%>
+<Macro vhost-deb.debian.org-extra>
+       Redirect /debian/           http://cdn-fastly.deb.debian.org/debian/
+       Redirect /debian-debug/     http://cdn-fastly.deb.debian.org/debian-debug/
+       Redirect /debian-security/  http://cdn-fastly.deb.debian.org/debian-security/
+</Macro>
+<% end -%>
+
+
 <%=
 
 def vhost(lines, sn, type=nil, extra=nil)
@@ -44,7 +55,7 @@ vhost(lines, "es.debconf.org"      , "ssl")
 vhost(lines, "fr.debconf.org"      , "ssl")
 vhost(lines, "miniconf10.debconf.org" , "ssl")
 
-vhost(lines, "deb.debian.org")
+vhost(lines, "deb.debian.org", "with-extra", '"Use vhost-deb.debian.org-extra"')
 
 lines.join("\n")
 -%>