X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=3d235ee9e1623201d0afd2f23d837d86519243e5;hb=421d51cedb758b5a27a89b5c458562f9c279cbc3;hp=2253aa7d2cfe47cd5198842700d43c8b8e99668a;hpb=3ce41982d7ff5837f7ae448258aa68465b1fd883;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 2253aa7d2..3d235ee9e 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -137,12 +137,16 @@
    # The GDPR does not apply and to satisfy the EU cookie law we can include
    # some explanatory text around the form that sets the cookie.
    # The use of POST requests will ensure each cookie is only set explictly.
+   # When a cookie is set by the user, update it on every visit so it doesn't
+   # expire unless the user stops visiting the website for the cookie duration.
    # Since Apache mod_rewrite cannot inspect POST data, we use URLs instead.
    RewriteEngine on
    RewriteCond %{REQUEST_METHOD} ^POST$
    RewriteRule /intro/cn/setlang/([a-z]{2}(?:-[a-z]{2})?)/(.*) /$2 [last,redirect,cookie=lang:$1:%{HTTP_HOST}:40320:/:secure:]
    RewriteCond %{REQUEST_METHOD} ^POST$
    RewriteRule /intro/cn/unsetlang/(.*) /$1 [last,redirect,cookie=lang:invalid:%{HTTP_HOST}:-1:/:secure:]
+   RewriteCond %{HTTP_COOKIE} /^lang=([a-z]{2}(?:-[a-z]{2})?)$/
+   RewriteRule . - [cookie=lang:%1:%{HTTP_HOST}:40320:/:secure:]
    SetEnvIf Cookie "lang=(.+)" prefer-language=$1
    Header append Vary cookie
 
@@ -239,8 +243,8 @@
    Redirect /cd /CD
 
    RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R]
-   RewriteRule ^/devel/debian-installer/report-template(.*) /releases/stable/i386/ch05s04.html#submit-bug [NE,R]
-   RewriteRule ^/devel/debian-installer/hooks(.*) https://d-i.alioth.debian.org/doc/internals/apb.html [R]
+   RewriteRule ^/devel/debian-installer/report-template(.*) /releases/stable/i386/ch05s04#submit-bug [NE,R]
+   RewriteRule ^/devel/debian-installer/hooks(.*) https://d-i.debian.org/doc/internals/apb.html [R]
    RewriteRule ^/doc/packaging-manuals/mime-policy(.*) /doc/debian-policy/ch-opersys.html#s-mime [NE,R]
 
    RewriteRule ^/volatile/index.* - [S=1]
@@ -266,16 +270,16 @@
    RewriteRule ^/doc/manuals/debian-reference/footnotes(.+)   /doc/manuals/debian-reference/index$1 [L,R]
    RewriteRule ^/doc/manuals/debian-reference/footnotes$      /doc/manuals/debian-reference/          [R]
 
-# DevRef filename changes c2016
-   RedirectMatch ^(/doc/manuals/developers-reference)/scope(\.[a-z]{2})?.html                 $1/ch01$2.html
-   RedirectMatch ^(/doc/manuals/developers-reference)/new-maintainer(\.[a-z]{2})?.html        $1/ch02$2.html
-   RedirectMatch ^(/doc/manuals/developers-reference)/developer-duties(\.[a-z]{2})?.html      $1/ch03$2.html
-   RedirectMatch ^(/doc/manuals/developers-reference)/resources(\.[a-z]{2})?.html             $1/ch04$2.html
-   RedirectMatch ^(/doc/manuals/developers-reference)/pkgs(\.[a-z]{2})?.html                  $1/ch05$2.html
-   RedirectMatch ^(/doc/manuals/developers-reference)/best-pkging-practices(\.[a-z]{2})?.html $1/ch06$2.html
-   RedirectMatch ^(/doc/manuals/developers-reference)/beyond-pkging(\.[a-z]{2})?.html         $1/ch07$2.html
-   RedirectMatch ^(/doc/manuals/developers-reference)/l10n(\.[a-z]{2})?.html                  $1/ch08$2.html
-   RedirectMatch ^(/doc/manuals/developers-reference)/tools(\.[a-z]{2})?.html                 $1/apa$2.html
+# DevRef filename changes c2019 (#931548, migration to Sphinx)
+   RedirectMatch ^(/doc/manuals/developers-reference)/ch01(\.[a-z]{2})?.html $1/scope$2.html
+   RedirectMatch ^(/doc/manuals/developers-reference)/ch02(\.[a-z]{2})?.html $1/new-maintainer$2.html
+   RedirectMatch ^(/doc/manuals/developers-reference)/ch03(\.[a-z]{2})?.html $1/developer-duties$2.html
+   RedirectMatch ^(/doc/manuals/developers-reference)/ch04(\.[a-z]{2})?.html $1/resources$2.html
+   RedirectMatch ^(/doc/manuals/developers-reference)/ch05(\.[a-z]{2})?.html $1/pkgs$2.html
+   RedirectMatch ^(/doc/manuals/developers-reference)/ch06(\.[a-z]{2})?.html $1/best-pkging-practices$2.html
+   RedirectMatch ^(/doc/manuals/developers-reference)/ch07(\.[a-z]{2})?.html $1/beyond-pkging$2.html
+   RedirectMatch ^(/doc/manuals/developers-reference)/ch08(\.[a-z]{2})?.html $1/l10n$2.html
+   RedirectMatch ^(/doc/manuals/developers-reference)/apa(\.[a-z]{2})?.html  $1/tools$2.html
 
 # New Maintainers' Guide
    RewriteRule ^/doc/(manuals/)?maint-guide/ch-(.*) /doc/manuals/maint-guide/$2 [R]