Add more -ports stuff

[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 36290f0..d971eca 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,8 +1,17 @@
 # puppet maintained
 
-<% if scope.function_has_static_component(['XXX']) -%>
+######################
+# 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)
@@ -19,34 +28,36 @@ end
 
 lines = []
 vhost(lines, "mozilla.debian.net")
-vhost(lines, "backports.debian.org")
+vhost(lines, "backports.debian.org", "ssl")
 vhost(lines, "incoming.debian.org")
-vhost(lines, "news.debian.net")
-vhost(lines, "debaday.debian.net")
+vhost(lines, "incoming.ports.debian.org")
 vhost(lines, "debdeltas.debian.net")
-vhost(lines, "timeline.debian.net")
-vhost(lines, "d-i.debian.org"          , "with-extra", '"ServerAlias d-i-backend.debian.org"')
+vhost(lines, "news.debian.net"         , "ssl")
+vhost(lines, "debaday.debian.net"      , "ssl")
+vhost(lines, "timeline.debian.net"     , "ssl")
 vhost(lines, "network-test.debian.org" , "with-extra", '"ServerAlias network-test-backend.debian.org"')
 vhost(lines, "blends.debian.org"       , "with-extra", '"ServerAlias blends-backend.debian.org"')
 vhost(lines, "wnpp-by-tags.debian.net" , "with-extra", '"ServerAlias wnpp-by-tags-backend.debian.org"')
 vhost(lines, "security-team.debian.org", "with-extra", '"ServerAlias security-team-backend.debian.org"')
+vhost(lines, "d-i.debian.org"      , "ssl")
 vhost(lines, "appstream.debian.org", "ssl")
 vhost(lines, "dsa.debian.org"      , "ssl")
 vhost(lines, "rtc.debian.org"      , "ssl")
 
-vhost(lines, "10years.debconf.org")
-vhost(lines, "debconf0.debconf.org")
-vhost(lines, "debconf1.debconf.org")
-vhost(lines, "debconf2.debconf.org")
-vhost(lines, "debconf3.debconf.org")
-vhost(lines, "debconf4.debconf.org")
-vhost(lines, "debconf5.debconf.org")
-vhost(lines, "debconf6.debconf.org")
-vhost(lines, "debconf7.debconf.org")
-vhost(lines, "es.debconf.org")
-vhost(lines, "fr.debconf.org")
-vhost(lines, "miniconf10.debconf.org")
-vhost(lines, "deb.debian.org")
+vhost(lines, "10years.debconf.org" , "ssl")
+vhost(lines, "debconf0.debconf.org", "ssl")
+vhost(lines, "debconf1.debconf.org", "ssl")
+vhost(lines, "debconf2.debconf.org", "ssl")
+vhost(lines, "debconf3.debconf.org", "ssl")
+vhost(lines, "debconf4.debconf.org", "ssl")
+vhost(lines, "debconf5.debconf.org", "ssl")
+vhost(lines, "debconf6.debconf.org", "ssl")
+vhost(lines, "debconf7.debconf.org", "ssl")
+vhost(lines, "es.debconf.org"      , "ssl")
+vhost(lines, "fr.debconf.org"      , "ssl")
+vhost(lines, "miniconf10.debconf.org" , "ssl")
+
+vhost(lines, "deb.debian.org", "with-extra", '"Use vhost-deb.debian.org-extra"')
 
 lines.join("\n")
 -%>
@@ -114,9 +125,6 @@ lines.join("\n")
        ServerName www.backports.org
        ServerAlias lists.backports.org
        ServerAdmin debian-admin@debian.org
-       RedirectPermanent /debian/           http://backports.debian.org/debian-backports/
-       RedirectPermanent /backports.org/    http://backports.debian.org/debian-backports/
-       RedirectPermanent /debian-backports/ http://backports.debian.org/debian-backports/
        RedirectPermanent / http://backports.debian.org/
 </VirtualHost>
 
@@ -158,15 +166,12 @@ lines.join("\n")
        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>