X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=fea7de7e5b73f765ac9d577b22d43cffc6178902;hb=2972577c62e8dfa15c111d5072b5755c3d1550e3;hp=0cb65ad1373b235c2c8d7ee11b3787ae38e6090f;hpb=a0251c92be2191ffa8a3c7572237a56de6b97bdb;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 0cb65ad13..fea7de7e5 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -1,214 +1,370 @@ # puppet maintained -<%= +###################### +# deb.debian.org +<% if scope.function_has_static_component(['deb.debian.org']) -%> + + ServerAlias httpredir.debian.org + ServerAlias cdn.debian.net + ServerAlias http.debian.net + + 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 + -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 + > + ServerName deb.debian.org - e = '' - if extra then e += " #{extra}"; end + ErrorLog /var/log/apache2/deb.debian.org-error.log + CustomLog /var/log/apache2/deb.debian.org-access.log privacyssl - lines << "Use #{t} #{sn}#{e}" - end -end + Use common-debian-service-ssl deb.debian.org + Use common-ssl-HSTS -lines = [] -vhost(lines, "mozilla.debian.net") -vhost(lines, "backports.debian.org") -vhost(lines, "incoming.debian.org") -vhost(lines, "news.debian.net") -vhost(lines, "debaday.debian.net") -vhost(lines, "debdeltas.debian.net") -vhost(lines, "timeline.debian.net") -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", "ssl") -vhost(lines, "debconf1.debconf.org", "ssl") -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") + ServerAdmin debian-admin@lists.debian.org + + UserDir disabled + + ServerSignature On -lines.join("\n") --%> + DocumentRoot /srv/static.debian.org/mirrors/deb.debian.org/cur + + AllowOverride FileInfo Indexes Options=Multiviews + Options Indexes SymLinksIfOwnerMatch + Require all granted + -###################### -# 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 + Header set Surrogate-Key <%= @hostname %> - ErrorLog /var/log/apache2/metadata.ftp-master.debian.org-error.log - CustomLog /var/log/apache2/metadata.ftp-master.debian.org-access.log privacy + AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css - Use common-static-base metadata.ftp-master.debian.org - AddDefaultCharset utf-8 - - ForceType text/plain - + Redirect /debian https://cdn-aws.deb.debian.org/debian + Redirect /debian-debug https://cdn-aws.deb.debian.org/debian-debug + Redirect /debian-ports https://cdn-aws.deb.debian.org/debian-ports + Redirect /debian-security https://cdn-aws.deb.debian.org/debian-security <% end -%> -###################### -# bits.debian.org -<% if scope.function_has_static_component(['bits.debian.org']) -%> - - ServerName bits.debian.org - ServerAdmin debian-admin@lists.debian.org + + ServerAlias network-test-backend.debian.org + + Header set Cache-Control "must-revalidate, max-age=0" + + - ErrorLog /var/log/apache2/bits.debian.org-error.log + CustomLog /var/log/apache2/bits.debian.org-public-access.log privacy+geo + - Use common-static-base bits.debian.org + + AddDefaultCharset utf-8 + + # Rewrite away double slashes + RewriteEngine on + RewriteCond %{REQUEST_URI} ^(.*)//(.*)$ [NC] + RewriteRule . %1/%2 [R=301,L,NE] + + + ForceType text/plain + + + + + RewriteEngine on + RewriteRule ^/migration/$ /migration/testing.pl + RewriteRule ^/migration/search/(.+)/$ /migration/testing.pl?package=$1 + RewriteCond %{QUERY_STRING} package=((.)(.*)) + RewriteRule ^/migration/testing.pl /migration/cache/%2/%1.html [PT,L] + RewriteRule ^/migration/testing.pl /migration/cache/_index.html + + Alias /oldstable-proposed-updates/ /srv/static.debian.org/mirrors/release.debian.org-pu/cur/ + Alias /proposed-updates/ /srv/static.debian.org/mirrors/release.debian.org-pu/cur/ + + Require all granted + Options Indexes SymLinksIfOwnerMatch MultiViews + + AddEncoding gzip .gz + FilterDeclare gzip CONTENT_SET + FilterProvider gzip inflate "%{req:Accept-Encoding} !~ /gzip/" + FilterChain gzip + + ForceType text/plain + AddDefaultCharset utf-8 + + + ForceType text/html + AddDefaultCharset utf-8 + + + + + + + AllowOverride FileInfo Indexes Options=Multiviews + Options Multiviews Indexes FollowSymLinks Includes + Require all granted + + + AddOutputFilter INCLUDES .xhtml - > + + + AddDefaultCharset utf-8 + + + Require all granted + + # These three lines makes apache serve + # "lintian.log.gz" as a text/plain with encoding gzip + # making it easier to view the log in the browser. + RemoveType .gz + AddEncoding x-gzip .gz + AddType text/plain .log + + AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css image/svg+xml + + + + # Cache these for a year (3600 * 24 * 365.25) + # Files in here will change name if their content change + Header set Cache-Control "max-age=31557600, public" + + RewriteEngine on + RewriteMap source-map txt:/srv/static.debian.org/mirrors/lintian.debian.org/cur/lookup-tables/source-packages + + # Re-direct from the "old" locations to the new ones + RewriteRule ^/reports/T(.*)\.html$ /tags/$1.html [L,R=permanent] + RewriteRule ^/reports/(.*)$ /$1 [L,R=permanent] + + # Map source packages to reports (this mapping is re-written once per lintian run, + # serve it as a 302 rather than a permanent redirect) + # Version-less request + RewriteRule ^/source/([a-z0-9-]+)/?$ /${source-map:$1} [L,R,NE] + # Versioned request + RewriteRule ^/source/([a-z0-9-]+)/([a-zA-Z0-9.+:~-]+)$ /${source-map:$1/$2} [L,R,NE] + + Header always set Content-Security-Policy "default-src 'self'; media-src 'none'; object-src 'none';" + + Header always set Content-Security-Policy "default-src 'none'; frame-ancestors 'none'; style-src 'self' 'unsafe-inline';" + + - RewriteEngine On - RewriteCond %{REQUEST_URI} !^/feeds/ - RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R,L] - #RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R=301,L] +<%= - Use static-bits.debian.org-base - CustomLog /var/log/apache2/bits.debian.org-access.log privacy - +def vhost(lines, sn, kwargs={}) + if scope.function_has_static_component([sn]) + if not kwargs[:extra] + lines << "" + lines << " # mod macro does not like empty macros, so here's some content:" + lines << " " + lines << " " + lines << "" + end + + lines << "Use prepare-static-vhost #{sn}" + + if kwargs[:ssl] and kwargs[:ssl_optional] + lines << "Use static-vhost-plain-#{sn}" + lines << "Use static-vhost-ssl-#{sn}" + elsif kwargs[:ssl] + lines << "Use common-dsa-vhost-https-redirect #{sn}" + lines << "Use static-vhost-ssl-#{sn}" + else + lines << "Use static-vhost-plain-#{sn}" + end + + onion = scope.function_onion_global_service_hostname([sn]) + lines << "Use static-vhost-onion-#{sn} #{onion}" if onion + + lines << "" + end +end - > - Use static-bits.debian.org-base - CustomLog /var/log/apache2/bits.debian.org-access.log privacyssl +lines = [] +vhost(lines, "mozilla.debian.net" , :ssl => true, :ssl_optional => true) +vhost(lines, "backports.debian.org" , :ssl => true) +vhost(lines, "incoming.debian.org" , :ssl => true, :ssl_optional => true) +vhost(lines, "incoming.ports.debian.org" , :ssl => true, :ssl_optional => true) +vhost(lines, "debdeltas.debian.net" , :ssl => true, :ssl_optional => true) +vhost(lines, "news.debian.net" , :ssl => true) +vhost(lines, "bootstrap.debian.net" , :ssl => true) +vhost(lines, "debaday.debian.net" , :ssl => true) +vhost(lines, "timeline.debian.net" , :ssl => true) +vhost(lines, "network-test.debian.org" , :extra => true) +vhost(lines, "blends.debian.org" , :ssl => true) +vhost(lines, "wnpp-by-tags.debian.net" , :ssl => true) +vhost(lines, "security-team.debian.org" , :ssl => true) +vhost(lines, "d-i.debian.org" , :ssl => true) +vhost(lines, "appstream.debian.org" , :ssl => true) +vhost(lines, "apt.buildd.debian.org" , :ssl => true) +vhost(lines, "dpl.debian.org" , :ssl => true) +vhost(lines, "dsa.debian.org" , :ssl => true) +vhost(lines, "rtc.debian.org" , :ssl => true) +vhost(lines, "mirror-master.debian.org" , :ssl => true) +vhost(lines, "onion.debian.org" , :ssl => true) +vhost(lines, "manpages.debian.org" , :ssl => true, :extra => true) +vhost(lines, "planet.debian.net") +vhost(lines, "cdbuilder-logs.debian.org" , :ssl => true) + +vhost(lines, "bits.debian.org" , :ssl => true, :extra => true) +vhost(lines, "micronews.debian.org" , :ssl => true) +vhost(lines, "metadata.ftp-master.debian.org", :extra => true) + +vhost(lines, "10years.debconf.org" , :ssl => true) +vhost(lines, "debconf0.debconf.org" , :ssl => true) +vhost(lines, "debconf1.debconf.org" , :ssl => true) +vhost(lines, "debconf2.debconf.org" , :ssl => true) +vhost(lines, "debconf3.debconf.org" , :ssl => true) +vhost(lines, "debconf4.debconf.org" , :ssl => true) +vhost(lines, "debconf5.debconf.org" , :ssl => true) +vhost(lines, "debconf6.debconf.org" , :ssl => true) +vhost(lines, "debconf7.debconf.org" , :ssl => true) +vhost(lines, "debconf16.debconf.org" , :ssl => true) +vhost(lines, "debconf17.debconf.org" , :ssl => true) +vhost(lines, "debconf18.debconf.org" , :ssl => true) +vhost(lines, "es.debconf.org" , :ssl => true) +vhost(lines, "fr.debconf.org" , :ssl => true) +vhost(lines, "miniconf10.debconf.org" , :ssl => true) + +vhost(lines, "deb.debian.org" , :extra => true) +vhost(lines, "release.debian.org" , :ssl => true, :extra => true) +vhost(lines, "www.ports.debian.org" , :ssl => true, :extra => true) +vhost(lines, "lintian.debian.org" , :ssl => true, :extra => true) - Use common-debian-service-ssl bits.debian.org - Use common-ssl-HSTS - -<% end -%> +lines.join("\n") +-%> # www.backports.org ################### # www.backports.org is the historical place for the backports # website and archive. It is now a CNAME to backports.debian.org: # redirect http requests. - > + > 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/ + RedirectPermanent / https://backports.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 - ServerAdmin debian-admin@lists.debian.org - - ErrorLog /var/log/apache2/www.ports.debian.org-error.log - CustomLog /var/log/apache2/www.ports.debian.org-access.log privacy - - - UserDir disabled - - ServerSignature On - - DocumentRoot /srv/static.debian.org/mirrors/www.ports.debian.org/cur - - 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 -%> - + > + ServerName www.debian-ports.org + ServerAlias debian-ports.org + ServerAdmin debian-admin@debian.org + RedirectPermanent / https://www.ports.debian.org/ + - AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css - AddOutputFilter INCLUDES .xhtml + > + ServerName ports.debian.org + ServerAlias ports.debian.net + ServerAdmin debian-admin@debian.org + RedirectPermanent / https://www.ports.debian.org/ -<% end -%> - > - ServerName www.debian-ports.org - ServerAlias debian-ports.org + > + ServerName incoming.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 / 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 https://www.ports.debian.org + RedirectPermanent /debian http://ftp.ports.debian.org/debian-ports + RedirectPermanent /debian-cd https://cdimage.debian.org/cdimage/ports/ + RedirectPermanent / http://ftp.ports.debian.org/ -# video.debian.net -################### - > + ServerName video.debian.net ServerAdmin debian-admin@debian.org + Redirect / https://meetings-archive.debian.net/pub/debian-meetings/ + - Redirect / http://meetings-archive.debian.net/pub/debian-meetings/ + > + Use vstatic-vhost-video.debian.net + + + > + Use vstatic-vhost-video.debian.net + Use common-debian-service-ssl video.debian.net + Use common-ssl-HSTS # historical sites ################## # now only redirects remain - > + > ServerName women.debian.org ServerAdmin debian-admin@debian.org - RedirectPermanent / http://www.debian.org/women/ - - RedirectPermanent /about/ http://www.debian.org/women/about - RedirectPermanent /contact/ http://www.debian.org/women/contact - RedirectPermanent /faqs/ http://www.debian.org/women/faq - RedirectPermanent /home/ http://www.debian.org/women/ - RedirectPermanent /images/dw.png http://www.debian.org/women/dw.png - RedirectPermanent /involvement/ http://www.debian.org/women/participate - RedirectPermanent /mentoring/ http://www.debian.org/women/mentoring - RedirectPermanent /press/ http://wiki.debian.org/DebianWomen/Press - RedirectPermanent /profiles/ http://www.debian.org/women/profiles/ + RedirectPermanent / https://www.debian.org/women/ + + RedirectPermanent /about/ https://www.debian.org/women/about + RedirectPermanent /contact/ https://www.debian.org/women/contact + RedirectPermanent /faqs/ https://www.debian.org/women/faq + RedirectPermanent /home/ https://www.debian.org/women/ + RedirectPermanent /images/dw.png https://www.debian.org/women/dw.png + RedirectPermanent /involvement/ https://www.debian.org/women/participate + RedirectPermanent /mentoring/ https://www.debian.org/women/mentoring + RedirectPermanent /press/ https://wiki.debian.org/DebianWomen/Press + RedirectPermanent /profiles/ https://www.debian.org/women/profiles/ - > + > ServerName volatile.debian.org ServerAlias volatile-master.debian.org ServerAdmin debian-admin@debian.org - RedirectPermanent / http://www.debian.org/volatile/ + RedirectPermanent / https://www.debian.org/volatile/ - > + > ServerName ftp-master.metadata.debian.org ServerAdmin debian-admin@debian.org RedirectPermanent / http://metadata.ftp-master.debian.org/ + > + ServerName backports-master.debian.org + ServerAdmin debian-admin@debian.org + RedirectPermanent / https://backports.debian.org/ + + + > + ServerName manpages.debian.net + ServerAdmin debian-admin@debian.org + Redirect / https://manpages.debian.org/ + + +Use common-dsa-vhost-https-redirect sources.debian.net + > + ServerName sources.debian.net + ServerAdmin debian-admin@debian.org + Use common-debian-service-ssl sources.debian.net + Use common-ssl-HSTS + Redirect permanent / https://sources.debian.org/ + + +# error pages +############# + +Use common-dsa-vhost-https-redirect archive.debian.net + > + ServerName archive.debian.net + ServerAdmin debian-admin@debian.org + ErrorLog /var/log/apache2/archive.debian.net-error.log + CustomLog /var/log/apache2/archive.debian.net-access.log privacyssl + Use common-debian-service-ssl archive.debian.net + Use common-ssl-HSTS + Use common-disabled-service + + + # vim:ft=apache: