infrastructure: Redirects for the new website

modules/adblockplusorg/files/adblockplus.org

Index: modules/adblockplusorg/files/adblockplus.org
===================================================================
--- a/modules/adblockplusorg/files/adblockplus.org
+++ b/modules/adblockplusorg/files/adblockplus.org
@@ -16,12 +16,23 @@
       set $preferredLang en;
     }
 
-    if ($arg_a ~ ^(view|show)?$) {
-      rewrite ^/(index\.html)?$ /$preferredLang/? redirect;
-      rewrite ^/(\w\w(_\w\w)?)$ /$1/ redirect;
+    if ($http_user_agent ~ \bChrome/\d+) {
+      set $browser "chrome";
+    }
+    if ($http_user_agent ~ \bPresto/\d+) {
+      set $browser "opera";
+    }
+    if ($http_user_agent !~ \bChrome/\d+) {

[Wladimir Palant, 2012/12/19 11:16:39]

Actually, it wasn't broken before - a rewrite statement has the effect that
further rules for the original location are no longer processed. Also, the
current version of the server config no longer has the pointless "not Chrome"
check, it simply defaults to Firefox if no other rules match. So please fix
this. Put |set $browser "firefox";| before the rules to have a default value,
override it with "chrome" or "opera" as necessary.

Also, please add the detection rule for Android here - this one was also added
to the server config after you created your copy.

[Felix Dahlke, 2012/12/19 11:45:30]

Right, didn't think there. I presumed this was just broken with the dev
environment so I didn't dig much further, just looked wrong.
Done.

+      set $browser "firefox";
     }
 
-    rewrite ^/(\w\w)/installation$ /$1/ permanent;
+    if ($arg_a ~ ^(view|show)?$) {
+      rewrite ^/(index\.html)?$ /$preferredLang/#$browser redirect;
+      rewrite ^/(\w\w(_\w\w)?)$ /$1/#$browser redirect;
+    }
+
+    rewrite ^/(\w\w(_\w\w)?)/(firefox|chrome|opera) /$1/#$3 permanent;

[Wladimir Palant, 2012/12/19 11:16:39]

Also android.

+    rewrite ^/(\w\w(_\w\w)?)/installation$ /$1/ permanent;

[Felix Dahlke, 2012/12/19 10:32:09]

This one I did fix while I was at it.

[Wladimir Palant, 2012/12/19 11:16:39]

Actually, I think that zh_CN was only added after the dedicated installation
page was gone - so there are no old links of this form to rewrite. Still, we can
have it like this for consistency.

     rewrite ^/anwiki/(.*) /$1 permanent;
 
     if (-f $request_filename) {
@@ -31,16 +42,6 @@
       break;
     }
 
-    if ($http_user_agent ~ \bChrome/\d+) {
-      rewrite ^/(\w\w(_\w\w)?)/?$ /$1/chrome;
-    }
-    if ($http_user_agent ~ \bPresto/\d+) {
-      rewrite ^/(\w\w(_\w\w)?)/?$ /$1/opera;
-    }
-    if ($http_user_agent !~ \bChrome/\d+) {
-      rewrite ^/(\w\w(_\w\w)?)/?$ /$1/firefox;
-    }
-
     set $static "";
     if (-f "$document_root/static$uri") {
       set $static "ok";