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;
     }
 
@@ skipping 26 matching lines @@
 
     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 $static_uri "/$1/";
+      set $browser $3;
     }
     set $static "";
     if (-f "$document_root/static$static_uri") {
       set $static "ok";
     }
     if (-d "$document_root/static$static_uri") {
       set $static "ok";
     }
     set $static "$static!$arg_a!$cookie_anwiki_anwsesscode";
     if ($static ~ ^ok!(view|show)?!$) {
-      rewrite ^/(\w\w(_\w\w)?)/(firefox|chrome|opera|android) /static/$1/?browser=$3 last;
-      rewrite (.*) /static/$1 last;

[Wladimir Palant, 2012/12/19 16:41:56]

Do we need the special case and code duplication for the index page? Why not
redirect to $static_uri with the browser parameter every time?

[Felix Dahlke, 2012/12/19 20:01:23]

You're right, changed that part. I was a bit worried that this would make some
query strings invalid, but I suppose we're not going to have any query
parameters at this point.

+      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;
 
-      sub_filter ' id="content"' ' id="content" class="$arg_browser"';

[Wladimir Palant, 2012/12/19 16:41:56]

Note that this will affect all pages, not just the homepage - they will get an
empty class attribute.

[Felix Dahlke, 2012/12/19 20:01:23]

I've tried to put that sub_filter inside an if, but that doesn't seem to be
allowed :( But that empty class is still not very nice, I've made some changes
to avoid that.

+      if ($arg_browser) {
+        set $browser_class ' class="$arg_browser"';
+      }
+      sub_filter ' id="content"' ' id="content"$browser_class';
   }
 
 
   location ~ \.php$ {
     client_max_body_size 8m;
+
+    if ($arg_browser) {
+      set $browser_class ' class="$arg_browser"';
+    }
+    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;
-
-    sub_filter ' id="content"' ' id="content" class="$arg_browser"';

[Wladimir Palant, 2012/12/19 16:41:56]

Nit: you probably should leave sub_filter in the same place as before.

[Felix Dahlke, 2012/12/19 20:01:23]

Done. Thought it made more sense down there but you're right, better to have a
useful diff.

   }
 }