X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=fef7303d9931ded08a3e7ae2528c95919ebfd0b2;hb=025fa478e25f10189ca63e5c94791d2263f114eb;hp=af78385947bcd2083db250b2e955eaf0707de06b;hpb=0393573e7f8beb4ada801a0e009b24ce59f96b4c;p=mirror%2Fdsa-puppet.git 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 af7838594..fef7303d9 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -1,21 +1,68 @@ # puppet maintained -Use common-static-vhost mozilla.debian.net -Use common-static-vhost backports.debian.org -Use common-static-vhost incoming.debian.org -Use common-static-vhost news.debian.net -Use common-static-vhost debaday.debian.net -Use common-static-vhost debdeltas.debian.net -Use common-static-vhost-with-extra d-i.debian.org "ServerAlias d-i-backend.debian.org" -Use common-static-vhost-with-extra network-test.debian.org "ServerAlias network-test-backend.debian.org" -Use common-static-vhost-with-extra blends.debian.org "ServerAlias blends-backend.debian.org" -Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by-tags-backend.debian.org" -Use common-static-vhost-ssl appstream.debian.org -Use common-static-vhost-ssl dsa.debian.org -Use common-static-vhost-ssl rtc.debian.org -Use common-static-vhost-with-extra security-team.debian.org "ServerAlias security-team-backend.debian.org" +###################### +# deb.debian.org +<% if scope.function_has_static_component(['deb.debian.org']) -%> + + 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/ + +<% end -%> + + +<%= + +def vhost(lines, sn, type=nil, extra=nil) + if scope.function_has_static_component([sn]) + t = 'common-static-vhost' + if type then t += "-#{type}"; end + + e = '' + if extra then e += " #{extra}"; end + + lines << "Use #{t} #{sn}#{e}" + end +end + +lines = [] +vhost(lines, "mozilla.debian.net") +vhost(lines, "backports.debian.org") +vhost(lines, "incoming.debian.org") +vhost(lines, "debdeltas.debian.net") +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" , "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") +-%> +###################### # metadata.ftp-master.debian.org +<% if scope.function_has_static_component(['metadata.ftp-master.debian.org']) -%> > ServerName metadata.ftp-master.debian.org ServerAdmin debian-admin@lists.debian.org @@ -29,9 +76,11 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit ForceType text/plain +<% end -%> -# bits.debian.org ###################### +# bits.debian.org +<% if scope.function_has_static_component(['bits.debian.org']) -%> ServerName bits.debian.org ServerAdmin debian-admin@lists.debian.org @@ -63,6 +112,7 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit Use common-debian-service-ssl bits.debian.org Use common-ssl-HSTS +<% end -%> # www.backports.org ################### @@ -73,15 +123,12 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit 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/ - -# www.ports.debian.org ###################### +# www.ports.debian.org +<% if scope.function_has_static_component(['www.ports.debian.org']) -%> > ServerName www.ports.debian.org ServerAlias www.ports-backend.debian.org @@ -108,10 +155,10 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit <% end -%> - DefaultType text/plain AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css AddOutputFilter INCLUDES .xhtml +<% end -%> > ServerName www.debian-ports.org @@ -130,6 +177,15 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit RedirectPermanent / http://www.ports.debian.org/ +# video.debian.net +################### + > + ServerName video.debian.net + ServerAdmin debian-admin@debian.org + + Redirect / http://meetings-archive.debian.net/pub/debian-meetings/ + + # historical sites ################## # now only redirects remain