X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=5900b1e451081cca901588954b4957f6c0de4c5f;hb=2f5346c750874d225f37e3498ad8bd71e9b11c3a;hp=e9177654548f6382918d6cee56b4872eddefabef;hpb=fa63526cb7a7dfc0abb51c0bbfacbd046a21dd91;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 e91776545..5900b1e45 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -9,6 +9,39 @@ Redirect /debian-ports/ http://cdn-fastly.deb.debian.org/debian-ports/ Redirect /debian-security/ http://cdn-fastly.deb.debian.org/debian-security/ + + > + ServerName deb.debian.org + + ErrorLog /var/log/apache2/deb.debian.org-error.log + CustomLog /var/log/apache2/deb.debian.org-access.log privacyssl + + Use common-debian-service-ssl deb.debian.org + Use common-ssl-HSTS + + ServerAdmin debian-admin@lists.debian.org + + UserDir disabled + + ServerSignature On + + DocumentRoot /srv/static.debian.org/mirrors/deb.debian.org/cur + + AllowOverride FileInfo Indexes Options=Multiviews + Options Indexes SymLinksIfOwnerMatch + IndexOptions FancyIndexing NameWidth=* + Require all granted + + + Header set Surrogate-Key <%= hostname %> + + AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css + + 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 -%> @@ -23,6 +56,12 @@ AddDefaultCharset utf-8 + + # Rewrite away double slashes + RewriteEngine on + RewriteCond %{REQUEST_URI} ^(.*)//(.*)$ [NC] + RewriteRule . %1/%2 [R=301,L,NE] + ForceType text/plain @@ -50,6 +89,10 @@ ForceType text/plain AddDefaultCharset utf-8 + + ForceType text/html + AddDefaultCharset utf-8 + @@ -63,6 +106,48 @@ 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 image/svg+xml + AddOutputFilterByType DEFLATE text/plain + + + + + # 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] + + <%= def vhost(lines, sn, kwargs={}) @@ -77,7 +162,10 @@ def vhost(lines, sn, kwargs={}) lines << "Use prepare-static-vhost #{sn}" - if kwargs[:ssl] + 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 @@ -92,44 +180,47 @@ def vhost(lines, sn, kwargs={}) end lines = [] -vhost(lines, "mozilla.debian.net") -vhost(lines, "backports.debian.org", :ssl => true) -vhost(lines, "incoming.debian.org") -vhost(lines, "incoming.ports.debian.org") -vhost(lines, "debdeltas.debian.net") -vhost(lines, "news.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, "dsa.debian.org" , :ssl => true) -vhost(lines, "rtc.debian.org" , :ssl => true) -vhost(lines, "onion.debian.org" , :ssl => true) - -vhost(lines, "bits.debian.org" , :ssl => true, :extra => true) -vhost(lines, "micronews.debian.net", :ssl => true) +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, "dsa.debian.org" , :ssl => true) +vhost(lines, "rtc.debian.org" , :ssl => true) +vhost(lines, "onion.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, "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, "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, "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) lines.join("\n") -%> @@ -215,4 +306,10 @@ lines.join("\n") RedirectPermanent / http://metadata.ftp-master.debian.org/ + > + ServerName backports-master.debian.org + ServerAdmin debian-admin@debian.org + RedirectPermanent / https://backports.debian.org/ + + # vim:ft=apache: