D7 custom - decoupled upstreams & limit_zones

.gitignore

@@ -1 +1,6 @@
 /*tar*
+custom/*.conf
+sites-available/*.conf
+sites-enabled/*.conf
+upstream/*.conf
+upstream/status_vhosts/*.conf

apps/drupal/admin_basic_auth.conf

@@ -8,5 +8,5 @@ location ^~ /admin {
     ## Include the specific FastCGI configuration. This is for a
     ## FCGI backend like php-cgi or php-fpm.
     include apps/drupal/fastcgi_drupal.conf;
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
 }

apps/drupal/drupal.conf

@@ -26,7 +26,7 @@ location / {
         ## Include the specific FastCGI configuration. This is for a
         ## FCGI backend like php-cgi or php-fpm.
         include apps/drupal/fastcgi_drupal.conf;
-        fastcgi_pass phpcgi;
+        fastcgi_pass $upstream_id;
 
         ## If proxying to apache comment the two lines above and
         ## uncomment the two lines below.
@@ -50,7 +50,7 @@ location / {
         ## Include the specific FastCGI configuration. This is for a
         ## FCGI backend like php-cgi or php-fpm.
         include apps/drupal/fastcgi_drupal.conf;
-        fastcgi_pass phpcgi;
+        fastcgi_pass $upstream_id;
 
         ## If proxying to apache comment the two lines above and
         ## uncomment the two lines below.
@@ -199,7 +199,7 @@ location / {
             ## Include the specific FastCGI configuration. This is for a
             ## FCGI backend like php-cgi or php-fpm.
             include apps/drupal/fastcgi_drupal.conf;
-            fastcgi_pass phpcgi;
+            fastcgi_pass $upstream_id;
 
             ## If proxying to apache comment the two lines above and
             ## uncomment the two lines below.
@@ -232,7 +232,7 @@ location / {
 location @drupal {
     ## Include the FastCGI config.
     include apps/drupal/fastcgi_drupal.conf;
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
 
     ## FastCGI microcache.
     include apps/drupal/microcache_fcgi.conf;
@@ -259,7 +259,7 @@ location @drupal-no-args {
     ## Include the specific FastCGI configuration. This is for a
     ## FCGI backend like php-cgi or php-fpm.
     include apps/drupal/fastcgi_no_args_drupal.conf;
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
 
     ## FastCGI microcache.
     include apps/drupal/microcache_fcgi.conf;

apps/drupal/drupal_boost.conf

@@ -26,7 +26,7 @@ location / {
         ## Include the specific FastCGI configuration. This is for a
         ## FCGI backend like php-cgi or php-fpm.
         include apps/drupal/fastcgi_drupal.conf;
-        fastcgi_pass phpcgi;
+        fastcgi_pass $upstream_id;
 
         ## If proxying to apache comment the two lines above and
         ## uncomment the line below.
@@ -50,7 +50,7 @@ location / {
         ## Include the specific FastCGI configuration. This is for a
         ## FCGI backend like php-cgi or php-fpm.
         include apps/drupal/fastcgi_drupal.conf;
-        fastcgi_pass phpcgi;
+        fastcgi_pass $upstream_id;
 
         ## If proxying to apache comment the two lines above and
         ## uncomment the line below.
@@ -192,7 +192,7 @@ location / {
             ## Include the specific FastCGI configuration. This is for a
             ## FCGI backend like php-cgi or php-fpm.
             include apps/drupal/fastcgi_drupal.conf;
-            fastcgi_pass phpcgi;
+            fastcgi_pass $upstream_id;
 
             ## If proxying to apache comment the two lines above and
             ## uncomment the line below.
@@ -263,7 +263,7 @@ location @cache {
 location @drupal {
     ## Include the FastCGI config.
     include apps/drupal/fastcgi_drupal.conf;
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
 
     ## FCGI microcache for authenticated users also.
     include apps/drupal/microcache_fcgi_auth.conf;
@@ -285,7 +285,7 @@ location @drupal-no-args {
     ## Include the specific FastCGI configuration. This is for a
     ## FCGI backend like php-cgi or php-fpm.
     include apps/drupal/fastcgi_no_args_drupal.conf;
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
 
     ## FCGI microcache for authenticated users also.
     include apps/drupal/microcache_fcgi_auth.conf;
@@ -369,7 +369,7 @@ location ~* ^.+\.php$ {
 
 ## Boost stats.
 location = /boost_stats.php {
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
     ## To use Apache for serving PHP uncomment the line bellow and
     ## comment out the above.
     #proxy_pass http://phpapache;

apps/drupal/drupal_boost_escaped.conf

@@ -29,7 +29,7 @@ location / {
         ## Include the specific FastCGI configuration. This is for a
         ## FCGI backend like php-cgi or php-fpm.
         include apps/drupal/fastcgi_drupal.conf;
-        fastcgi_pass phpcgi;
+        fastcgi_pass $upstream_id;
 
         ## If proxying to apache comment the two lines above and
         ## uncomment the line below.
@@ -53,7 +53,7 @@ location / {
         ## Include the specific FastCGI configuration. This is for a
         ## FCGI backend like php-cgi or php-fpm.
         include apps/drupal/fastcgi_drupal.conf;
-        fastcgi_pass phpcgi;
+        fastcgi_pass $upstream_id;
 
         ## If proxying to apache comment the two lines above and
         ## uncomment the line below.
@@ -195,7 +195,7 @@ location / {
             ## Include the specific FastCGI configuration. This is for a
             ## FCGI backend like php-cgi or php-fpm.
             include apps/drupal/fastcgi_drupal.conf;
-            fastcgi_pass phpcgi;
+            fastcgi_pass $upstream_id;
 
             ## If proxying to apache comment the two lines above and
             ## uncomment the line below.
@@ -267,7 +267,7 @@ location @cache {
 location @drupal {
     ## Include the FastCGI config.
     include apps/drupal/fastcgi_drupal.conf;
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
 
     ## FCGI microcache for authenticated users also.
     include apps/drupal/microcache_fcgi_auth.conf;
@@ -289,7 +289,7 @@ location @drupal-no-args {
     ## Include the specific FastCGI configuration. This is for a
     ## FCGI backend like php-cgi or php-fpm.
     include apps/drupal/fastcgi_no_args_drupal.conf;
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
 
     ## FCGI microcache for authenticated users also.
     include apps/drupal/microcache_fcgi_auth.conf;
@@ -373,7 +373,7 @@ location ~* ^.+\.php$ {
 
 ## Boost stats.
 location = /boost_stats.php {
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
     ## To use Apache for serving PHP uncomment the line bellow and
     ## comment out the above.
     #proxy_pass http://phpapache;

apps/drupal/drupal_cron_update.conf

@@ -3,7 +3,7 @@
 
 ## XMLRPC. Comment out if not enabled.
 location = /xmlrpc.php {
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
     # To use Apache for serving PHP uncomment the line bellow and
     # comment out the above.
     #proxy_pass http://phpapache;
@@ -16,15 +16,15 @@ location = /cron.php {
     if ($not_allowed_cron) {
         return 404 /;
     }
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
     ## To use Apache for serving PHP uncomment the line bellow and
     ## comment out the above.
     #proxy_pass http://phpapache;
 }
 
 ## Run the update from the web interface with Drupal 7.
 location = /authorize.php {
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
     ## To use Apache for serving PHP uncomment the line bellow and
     ## comment out the above.
     #proxy_pass http://phpapache;
@@ -33,7 +33,7 @@ location = /authorize.php {
 location = /update.php {
     auth_basic "Restricted Access"; # auth realm
     auth_basic_user_file .htpasswd-users; # htpasswd file
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
     ## To use Apache for serving PHP uncomment the line bellow and
     ## comment out the above.
     #proxy_pass http://phpapache;

apps/drupal/drupal_escaped.conf

@@ -29,7 +29,7 @@ location / {
         ## Include the specific FastCGI configuration. This is for a
         ## FCGI backend like php-cgi or php-fpm.
         include apps/drupal/fastcgi_drupal.conf;
-        fastcgi_pass phpcgi;
+        fastcgi_pass $upstream_id;
 
         ## If proxying to apache comment the two lines above and
         ## uncomment the line below.
@@ -53,7 +53,7 @@ location / {
         ## Include the specific FastCGI configuration. This is for a
         ## FCGI backend like php-cgi or php-fpm.
         include apps/drupal/fastcgi_drupal.conf;
-        fastcgi_pass phpcgi;
+        fastcgi_pass $upstream_id;
 
         ## If proxying to apache comment the two lines above and
         ## uncomment the line below.
@@ -201,7 +201,7 @@ location / {
             ## Include the specific FastCGI configuration. This is for a
             ## FCGI backend like php-cgi or php-fpm.
             include apps/drupal/fastcgi_drupal.conf;
-            fastcgi_pass phpcgi;
+            fastcgi_pass $upstream_id;
 
             ## If proxying to apache comment the two lines above and
             ## uncomment the line below.
@@ -233,7 +233,7 @@ location / {
 location @drupal {
     ## Include the FastCGI config.
     include apps/drupal/fastcgi_drupal.conf;
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
 
     ## FastCGI microcache.
     include apps/drupal/microcache_fcgi.conf;
@@ -259,7 +259,7 @@ location @drupal-no-args {
     ## Include the specific FastCGI configuration. This is for a
     ## FCGI backend like php-cgi or php-fpm.
     include apps/drupal/fastcgi_no_args_drupal.conf;
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
 
     ## FastCGI microcache.
     include apps/drupal/microcache_fcgi.conf;

apps/drupal/drupal_install.conf

@@ -5,12 +5,12 @@
 location = /install.php {
     auth_basic "Restricted Access"; # auth realm
     auth_basic_user_file .htpasswd-users; # htpasswd file
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
 }
 
 ## This is for drupal 8. There's a new location for the install file.
 location = /core/install.php {
     auth_basic "Restricted Access"; # auth realm
     auth_basic_user_file .htpasswd-users; # htpasswd file
-    fastcgi_pass phpcgi;
+    fastcgi_pass $upstream_id;
 }

apps/drupal/microcache_fcgi.conf

@@ -6,7 +6,7 @@
 ## The cache zone referenced.
 fastcgi_cache microcache;
 ## The cache key.
-fastcgi_cache_key $scheme$request_method$host$request_uri;
+fastcgi_cache_key $scheme$request_method$is_mobile$host$request_uri;
 
 ## For 200 and 301 make the cache valid for 1s seconds.
 fastcgi_cache_valid 200 301 1s;

blockips.conf

@@ -0,0 +1,14 @@
+#-*- mode: nginx; mode: flyspell-prog; ispell-local-dictionary: "american" -*-
+### This file implements a blacklist for misbehaved IPs.
+### It's a first line of defense. It must be included
+### inside a http block.
+
+
+## Add here all ip addresses or CIDR blocks that are to be blocked.
+## Format:
+##        deny <IP>;
+##        deny <NET>/<MASK>;
+##
+## Example:
+##        deny 10.1.2.3;
+##        deny 10.0.0.0/8;

custom/README.md

@@ -0,0 +1,6 @@
+Custom configuration bits
+=========================
+
+Place your custom configuration files here.
+
+There is no way to know where you'll need to include them so they are not included anywhere by default.

map_mobile_useragent.conf

@@ -0,0 +1,18 @@
+# -*- mode: nginx; mode: flyspell-prog;  ispell-local-dictionary: "american" -*-
+### Testing if the client is a mobile or a desktop.
+### The selection is based on the usual UA strings for desktop browsers.
+
+## Testing a user agent using a method that reverts the logic of the
+## UA detection. Inspired by notnotmobile.appspot.com.
+map $http_user_agent $is_desktop {
+    default 0;
+    ~*linux.*android|windows\s+(?:ce|phone) 0; # exceptions to the rule
+    ~*spider|crawl|slurp|bot 1; # bots
+    ~*windows|linux|os\s+x\s*[\d\._]+|solaris|bsd 1; # OSes
+}
+
+## Revert the logic.
+map $is_desktop $is_mobile {
+    1 0;
+    0 1;
+}