infrastructure: Redirects for the new website

modules/adblockplusorg/files/adblockplus.org

 server {
   root /var/www/adblockplus.org/httpdocs;
 
   location / {
     index index.php index index.html;
 
     if ($arg_a = "view") {
       rewrite ^(.*) $1? permanent;
     }
 
     set $preferredLang en;
     if ($http_accept_language ~ ^(\w\w)\b) {
       set $preferredLang $1;
     }
     if (!-f $document_root/static/$preferredLang/index) {
       set $preferredLang en;
     }
 
+    set $browser "firefox";
     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";
+    if ($http_user_agent ~ \bAndroid\s.*\bAppleWebKit/\d+) {
+      set $browser "android";
     }
 
     if ($arg_a ~ ^(view|show)?$) {
-      rewrite ^/(index\.html)?$ /$preferredLang/#$browser redirect;
-      rewrite ^/(\w\w(_\w\w)?)$ /$1/#$browser redirect;
+      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) {
       break;
     }
     if (-d $request_filename) {
       break;
     }
 
+    set $static_uri $uri;
+    if ($uri ~ ^/(\w\w(_\w\w)?)/(firefox|chrome|opera|android)) {
+      set $static_uri "/$1/";
+      set $browser $3;
+    }
     set $static "";
-    if (-f "$document_root/static$uri") {
+    if (-f "$document_root/static$static_uri") {
       set $static "ok";
     }
-    if (-d "$document_root/static$uri") {
+    if (-d "$document_root/static$static_uri") {
       set $static "ok";
     }
     set $static "$static!$arg_a!$cookie_anwiki_anwsesscode";
     if ($static ~ ^ok!(view|show)?!$) {
-      rewrite (.*) /static$1 last;
+      rewrite ^ /static$static_uri?browser=$browser last;
     }
 
+    rewrite ^/(\w\w(_\w\w)?)/(firefox|chrome|opera|android) /index.php?p=$1&browser=$3 last;
     rewrite ^/(.*) /index.php?p=$1 last;
   }
 
   location /static/ {
       index index;
       internal;
       types {
         image/png png;
         text/xml xml;
         text/css css;
       }
       default_type text/html;
       charset utf-8;
 
-      set $browserClass ' nongecko';
-      if ($http_user_agent ~ \bGecko/\d+) {
-        set $browserClass ' gecko';
+      if ($arg_browser) {
+        set $browser_class ' class="$arg_browser"';
       }
-      if ($http_user_agent ~ \bK-Meleon\b) {
-        set $browserClass ' kmeleon';
-      }
-      if ($http_user_agent ~ \bChrome/\d+) {
-        set $browserClass ' chrome';
-      }
-      if ($http_user_agent ~ \bPresto/\d+) {
-        set $browserClass ' opera';
-      }
-      sub_filter ' id="content" class="multicolumn"' ' id="content" class="multicolumn$browserClass"';
+      sub_filter ' id="content"' ' id="content"$browser_class';
   }
 
 
   location ~ \.php$ {
     client_max_body_size 8m;
 
-    set $browserClass ' nongecko';
-    if ($http_user_agent ~ \bGecko/\d+) {
-      set $browserClass ' gecko';
+    if ($arg_browser) {
+      set $browser_class ' class="$arg_browser"';
     }
-    if ($http_user_agent ~ \bK-Meleon\b) {
-      set $browserClass ' kmeleon';
-    }
-    if ($http_user_agent ~ \bChrome/\d+) {
-      set $browserClass ' chrome';
-    }
-    if ($http_user_agent ~ \bPresto/\d+) {
-      set $browserClass ' opera';
-    }
-    sub_filter ' id="content" class="multicolumn"' ' id="content" class="multicolumn$browserClass"';
+    sub_filter ' id="content"' ' id="content"$browser_class';
 
     fastcgi_pass unix:/tmp/php-fastcgi.sock;
     fastcgi_index index.php;
 
     fastcgi_param SCRIPT_FILENAME /var/www/adblockplus.org/phproot$fastcgi_script_name;
 
     fastcgi_param QUERY_STRING $query_string;
     fastcgi_param REQUEST_METHOD $request_method;
     fastcgi_param CONTENT_TYPE $content_type;
     fastcgi_param CONTENT_LENGTH $content_length;
 
     fastcgi_param SCRIPT_NAME $fastcgi_script_name;
     fastcgi_param REQUEST_URI $request_uri;
     fastcgi_param DOCUMENT_URI $document_uri;
     fastcgi_param DOCUMENT_ROOT $document_root;
     fastcgi_param SERVER_PROTOCOL $server_protocol;
 
     fastcgi_param GATEWAY_INTERFACE CGI/1.1;
     fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
 
     fastcgi_param REMOTE_ADDR $remote_addr;
     fastcgi_param REMOTE_PORT $remote_port;
     fastcgi_param SERVER_ADDR $server_addr;
     fastcgi_param SERVER_PORT $server_port;
     fastcgi_param SERVER_NAME $server_name;
   }
 }