debconf19 is not static just yet

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb

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 f9dd941..adddd55 100644 (file)
--- 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]
 
        <LocationMatch "/changelogs/(main|contrib|non-free)">
                ForceType text/plain
@@ -99,6 +99,7 @@
                        ForceType text/html
                        AddDefaultCharset utf-8
                </Files>
+               AddType text/plain .wml
        </Directory>
 </Macro>
 
@@ -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 @@
        </Location>
 
        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(&|$)
@@ -194,6 +196,53 @@
        RewriteRule ^/load.php$ /load-jquery.checkbox.js [L,QSD]
 </Macro>
 
+<Macro vstatic-vhost-extra-www.debconf.org>
+       ServerAlias www-test.debconf.org
+
+       <Directory /srv/static.debian.org/mirrors/www.debconf.org/cur>
+               Options +IncludesNOEXEC
+               SSILegacyExprParser on
+               DirectoryIndex index.shtml
+       </Directory>
+
+       AddOutputFilter INCLUDES .shtml
+
+       RewriteEngine On
+       # A few redirects for older debconf sites, so old links work
+       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]
+</Macro>
+
+<Macro vstatic-vhost-extra-openpgpkey.debian.org>
+       # 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/<hash>
+       #  get a redirect to https://openpgpkey.debian.org/.well-known/openpgpkey/debian.org/hu/<hash>
+       #  and then try to fetch https://openpgpkey.debian.org/.well-known/openpgpkey/hu/<hash>
+       # *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/
+       <Location />
+               Options -Indexes
+       </Location>
+
+       RewriteEngine on
+       RewriteRule ^/$ https://keyring.debian.org/ [L]
+</Macro>
+
 <%=
 
 def vhost(lines, sn, kwargs={})
@@ -241,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)
 
@@ -266,11 +315,11 @@ 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)
 vhost(lines, "wiki.debconf.org"              , :ssl => true, :extra => true)
+vhost(lines, "www.debconf.org"               , :ssl => true, :extra => true)
 
 vhost(lines, "deb.debian.org"                , :extra => true)
 vhost(lines, "release.debian.org"            , :ssl => true, :extra => true)
@@ -379,6 +428,15 @@ Use common-dsa-vhost-https-redirect video.debconf.org
 </VirtualHost>
 <% end -%>
 
+Use common-dsa-vhost-https-redirect debconf.org
+<VirtualHost <%= @vhost_listen_443 %> >
+       ServerName debconf.org
+       ServerAdmin debian-admin@debian.org
+       Use common-debian-service-ssl debconf.org
+       Use common-ssl-HSTS
+       Redirect / https://www.debconf.org/
+</VirtualHost>
+
 # historical sites
 ##################
 # now only redirects remain