X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=8821896d66952ff364dfae3a4770edb25e250d64;hb=60afaa8904cb819ceec6b1739d2f220d052feec3;hp=e3a64e437c5ebf03634bbf91867acdc64dd3c16d;hpb=186b13bbe5f9cfe1a8a58ddb860e4c9c49903320;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 e3a64e437..8821896d6 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -1,34 +1,70 @@ # 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 timeline.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" -Use common-static-vhost 10years.debconf.org -Use common-static-vhost debconf0.debconf.org -Use common-static-vhost debconf1.debconf.org -Use common-static-vhost debconf2.debconf.org -Use common-static-vhost debconf3.debconf.org -Use common-static-vhost debconf4.debconf.org -Use common-static-vhost debconf5.debconf.org -Use common-static-vhost debconf6.debconf.org -Use common-static-vhost debconf7.debconf.org -Use common-static-vhost es.debconf.org -Use common-static-vhost fr.debconf.org -Use common-static-vhost miniconf10.debconf.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-ports/ http://cdn-fastly.deb.debian.org/debian-ports/ + 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", "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") +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 @@ -42,9 +78,11 @@ Use common-static-vhost miniconf10.debconf.org 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 @@ -76,6 +114,7 @@ Use common-static-vhost miniconf10.debconf.org Use common-debian-service-ssl bits.debian.org Use common-ssl-HSTS +<% end -%> # www.backports.org ################### @@ -86,16 +125,16 @@ Use common-static-vhost miniconf10.debconf.org 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']) -%> + +Use common-dsa-vhost-https-redirect www.ports.debian.org + + > ServerName www.ports.debian.org ServerAlias www.ports-backend.debian.org ServerAdmin debian-admin@lists.debian.org @@ -103,6 +142,9 @@ Use common-static-vhost miniconf10.debconf.org ErrorLog /var/log/apache2/www.ports.debian.org-error.log CustomLog /var/log/apache2/www.ports.debian.org-access.log privacy + Use common-debian-service-ssl www.ports.debian.org + Use common-ssl-HSTS + UserDir disabled @@ -113,33 +155,41 @@ Use common-static-vhost miniconf10.debconf.org AllowOverride FileInfo Indexes Options=Multiviews Options Multiviews Indexes FollowSymLinks Includes IndexOptions FancyIndexing NameWidth=* - <% if @lsbmajdistrelease > '7' -%> - Require all granted - <% else -%> - Order allow,deny - Allow from all - <% end -%> + Require all granted AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css AddOutputFilter INCLUDES .xhtml +<% end -%> > 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/ + RedirectPermanent / https://www.ports.debian.org/ + + + > + ServerName ports.debian.org + ServerAlias ports.debian.net + ServerAdmin debian-admin@debian.org + RedirectPermanent / https://www.ports.debian.org/ + + + > + ServerName incoming.debian-ports.org + ServerAdmin debian-admin@debian.org + RedirectPermanent / http://incoming.ports.debian.org/ > - ServerName ports.debian.net + ServerName ftp.debian-ports.org ServerAdmin debian-admin@debian.org - RedirectPermanent / http://www.ports.debian.org/ + RedirectPermanent /archive http://www.ports.debian.org + RedirectPermanent /debian http://ftp.ports.debian.org/debian-ports + RedirectPermanent /debian-cd http://ftp.ports.debian.org/debian-ports-cd + RedirectPermanent / http://ftp.ports.debian.org/ # video.debian.net