X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=adddd55b9d226bd4eafcede57a320ad5403dfec6;hb=775af04d2d69bcbfe143e8cc3c23a364a6bb4375;hp=bac115a2733cc69ec99e53e2cd27709a4bdc5c4f;hpb=81ba6474f335921aa0c3b726e604a5a56269315e;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 bac115a27..adddd55b9 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -66,7 +66,7 @@ # Rewrite away double slashes RewriteEngine on RewriteCond %{REQUEST_URI} ^(.*)//(.*)$ [NC] - RewriteRule . %1/%2 [R=301,L,NE] + RewriteRule . %1/%2 [L,NE] ForceType text/plain @@ -99,6 +99,7 @@ ForceType text/html AddDefaultCharset utf-8 + AddType text/plain .wml @@ -139,8 +140,8 @@ 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] + RewriteRule ^/reports/T(.*)\.html$ /tags/$1.html [L] + RewriteRule ^/reports/(.*)$ /$1 [L] # Map source packages to reports (this mapping is re-written once per lintian run, # serve it as a 302 rather than a permanent redirect) @@ -164,8 +165,9 @@ RewriteEngine on - RewriteRule ^/$ /wiki/Main_Page [L,R=permanent] - RewriteRule ^/wiki/$ /wiki/Main_Page [L,R=permanent] + SSLProxyEngine on + RewriteRule ^/$ /wiki/Main_Page [L,P] + RewriteRule ^/wiki/$ /wiki/Main_Page [L] RewriteCond %{QUERY_STRING} (^|&)modules=mediawiki.legacy.commonPrint,shared|skins.monobook(&|$) RewriteCond %{QUERY_STRING} (^|&)only=styles(&|$) @@ -207,17 +209,38 @@ RewriteEngine On # A few redirects for older debconf sites, so old links work - RewriteRule ^/gallery/(.*)$ https://gallery.debconf.org/v/$1 [R=permanent,L] - RewriteRule ^/.*years$ https://10years.debconf.org/ [R=permanent,L] - RewriteRule ^/debconf2$ https://debconf2.debconf.org/ [R=permanent,L] - RewriteRule ^/debconf3$ https://debconf3.debconf.org/ [R=permanent,L] - RewriteRule ^/debconf4$ https://debconf4.debconf.org/ [R=permanent,L] - RewriteRule ^/debconf5$ https://debconf5.debconf.org/ [R=permanent,L] - RewriteRule ^/10years/(.*)$ https://10years.debconf.org/$1 [R=permanent,L] - RewriteRule ^/debconf2/(.*)$ https://debconf2.debconf.org/$1 [R=permanent,L] - RewriteRule ^/debconf3/(.*)$ https://debconf3.debconf.org/$1 [R=permanent,L] - RewriteRule ^/debconf4/(.*)$ https://debconf4.debconf.org/$1 [R=permanent,L] - RewriteRule ^/debconf5/(.*)$ https://debconf5.debconf.org/$1 [R=permanent,L] + RewriteRule ^/gallery/(.*)$ https://gallery.debconf.org/v/$1 [L] + RewriteRule ^/.*years$ https://10years.debconf.org/ [L] + RewriteRule ^/debconf2$ https://debconf2.debconf.org/ [L] + RewriteRule ^/debconf3$ https://debconf3.debconf.org/ [L] + RewriteRule ^/debconf4$ https://debconf4.debconf.org/ [L] + RewriteRule ^/debconf5$ https://debconf5.debconf.org/ [L] + RewriteRule ^/10years/(.*)$ https://10years.debconf.org/$1 [L] + RewriteRule ^/debconf2/(.*)$ https://debconf2.debconf.org/$1 [L] + RewriteRule ^/debconf3/(.*)$ https://debconf3.debconf.org/$1 [L] + RewriteRule ^/debconf4/(.*)$ https://debconf4.debconf.org/$1 [L] + RewriteRule ^/debconf5/(.*)$ https://debconf5.debconf.org/$1 [L] + + + + # Legacy GPG versions (including 2.2.12 in buster/Debian 10) get redirections from + # the (not supposed to be default) direct method wrong. + # They ask for https://debian.org/.well-known/openpgpkey/hu/ + # get a redirect to https://openpgpkey.debian.org/.well-known/openpgpkey/debian.org/hu/ + # and then try to fetch https://openpgpkey.debian.org/.well-known/openpgpkey/hu/ + # *sigh* + # cf. https://dev.gnupg.org/T4603 + Alias /.well-known/openpgpkey/hu/ /srv/static.debian.org/mirrors/openpgpkey.debian.org/cur/debian.org/hu/ + Alias /.well-known/openpgpkey/policy /srv/static.debian.org/mirrors/openpgpkey.debian.org/cur/debian.org/policy + + # The draft specified well-known place using the "advanced method" + Alias /.well-known/openpgpkey/ /srv/static.debian.org/mirrors/openpgpkey.debian.org/cur/ + + Options -Indexes + + + RewriteEngine on + RewriteRule ^/$ https://keyring.debian.org/ [L] <%= @@ -267,12 +290,12 @@ 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, "openpgpkey.debian.org" , :ssl => true, :extra => true) vhost(lines, "manpages.debian.org" , :ssl => true, :extra => true) vhost(lines, "cdbuilder-logs.debian.org" , :ssl => true) @@ -292,7 +315,6 @@ 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, "debconf19.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) @@ -406,6 +428,15 @@ Use common-dsa-vhost-https-redirect video.debconf.org <% end -%> +Use common-dsa-vhost-https-redirect debconf.org + > + ServerName debconf.org + ServerAdmin debian-admin@debian.org + Use common-debian-service-ssl debconf.org + Use common-ssl-HSTS + Redirect / https://www.debconf.org/ + + # historical sites ################## # now only redirects remain