# 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-ports/ http://cdn-fastly.deb.debian.org/debian-ports/
+ Redirect /debian-security/ http://cdn-fastly.deb.debian.org/debian-security/
+</Macro>
+<% end -%>
+
+
<%=
def vhost(lines, sn, type=nil, extra=nil)
lines = []
vhost(lines, "mozilla.debian.net")
-vhost(lines, "backports.debian.org")
+vhost(lines, "backports.debian.org", "ssl")
vhost(lines, "incoming.debian.org")
+vhost(lines, "incoming.ports.debian.org")
vhost(lines, "debdeltas.debian.net")
vhost(lines, "news.debian.net" , "ssl")
vhost(lines, "debaday.debian.net" , "ssl")
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']) -%>
ServerName www.debian-ports.org
ServerAlias debian-ports.org
ServerAdmin debian-admin@debian.org
- RedirectPermanent /archive/ http://archive.ports.debian.org/archive/
- RedirectPermanent /debian-cd/ http://archive.ports.debian.org/debian-cd/
- RedirectPermanent /debian-snapshot/ http://archive.ports.debian.org/debian-snapshot/
- RedirectPermanent /debian/ http://archive.ports.debian.org/debian/
RedirectPermanent / http://www.ports.debian.org/
</VirtualHost>
<VirtualHost <%= vhost_listen %> >
- ServerName ports.debian.net
+ ServerName ports.debian.org
+ ServerAlias ports.debian.net
ServerAdmin debian-admin@debian.org
RedirectPermanent / http://www.ports.debian.org/
</VirtualHost>