Remove redundant error_page config from nginx web templates, they are inherited from nginx.conf

install/deb/multiphp/nginx/PHP-56.stpl

@@ -29,10 +29,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/multiphp/nginx/PHP-56.tpl

@@ -28,10 +28,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/multiphp/nginx/PHP-70.stpl

@@ -29,10 +29,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/multiphp/nginx/PHP-70.tpl

@@ -28,10 +28,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/multiphp/nginx/PHP-71.stpl

@@ -29,10 +29,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/multiphp/nginx/PHP-71.tpl

@@ -28,10 +28,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/multiphp/nginx/PHP-72.stpl

@@ -29,10 +29,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/multiphp/nginx/PHP-72.tpl

@@ -28,10 +28,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/multiphp/nginx/PHP-73.stpl

@@ -29,10 +29,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/multiphp/nginx/PHP-73.tpl

@@ -28,10 +28,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/nginx/nginx.conf

@@ -123,6 +123,7 @@ http {
     # Error pages
     error_page 403 /error/404.html;
     error_page 404 /error/404.html;
+    error_page 410 /error/410.html;
     error_page 500 501 502 503 504 505 /error/50x.html;
 
     # Cache settings

install/deb/templates/mail/nginx/default.stpl

@@ -36,10 +36,6 @@ server {
         }
     }
 
-    error_page 403 /error/404.html;
-    error_page 404 /error/404.html;
-    error_page 500 502 503 504 505 /error/50x.html;
-
     location /error/ {
         alias /var/www/document_errors/;
     }

install/deb/templates/mail/nginx/default.tpl

@@ -36,10 +36,6 @@ server {
         }
     }
 
-    error_page 403 /error/404.html;
-    error_page 404 /error/404.html;
-    error_page 500 502 503 504 505 /error/50x.html;
-
     location /error/ {
         alias /var/www/document_errors/;
     }

install/deb/templates/mail/nginx/web_system.stpl

@@ -34,10 +34,6 @@ server {
         }
     }
 
-    error_page 403 /error/404.html;
-    error_page 404 /error/404.html;
-    error_page 500 502 503 504 505 /error/50x.html;
-
     location /error/ {
         alias /var/www/document_errors/;
     }

install/deb/templates/mail/nginx/web_system.tpl

@@ -34,10 +34,6 @@ server {
         }
     }
 
-    error_page 403 /error/404.html;
-    error_page 404 /error/404.html;
-    error_page 500 502 503 504 505 /error/50x.html;
-
     location /error/ {
         alias /var/www/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/cms_made_simple.stpl

@@ -30,10 +30,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/cms_made_simple.tpl

@@ -29,10 +29,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/codeigniter2.stpl

@@ -35,10 +35,6 @@ server {
         return 444;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/codeigniter2.tpl

@@ -34,10 +34,6 @@ server {
         return 444;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/codeigniter3.stpl

@@ -30,10 +30,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/codeigniter3.tpl

@@ -29,10 +29,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/datalife_engine.stpl

@@ -101,10 +101,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/datalife_engine.tpl

@@ -100,10 +100,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/default.stpl

@@ -30,10 +30,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/default.tpl

@@ -29,10 +29,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/dokuwiki.stpl

@@ -46,10 +46,6 @@ server {
         rewrite ^/(.*) /doku.php?id=$1 last;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/dokuwiki.tpl

@@ -44,10 +44,6 @@ server {
         rewrite ^/(.*) /doku.php?id=$1 last;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/drupal6.stpl

@@ -68,10 +68,6 @@ server {
         include /etc/nginx/fastcgi_params;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/drupal6.tpl

@@ -67,10 +67,6 @@ server {
         include /etc/nginx/fastcgi_params;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/drupal7.stpl

@@ -68,10 +68,6 @@ server {
         include         /etc/nginx/fastcgi_params;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/drupal7.tpl

@@ -67,10 +67,6 @@ server {
         include         /etc/nginx/fastcgi_params;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/drupal8.stpl

@@ -68,10 +68,6 @@ server {
         include         /etc/nginx/fastcgi_params;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/drupal8.tpl

@@ -67,10 +67,6 @@ server {
         include         /etc/nginx/fastcgi_params;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/joomla.stpl

@@ -37,9 +37,10 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
+    error_page 403 /error/404.html;
+    error_page 404 /error/404.html;
+    error_page 410 /error/410.html;
+    error_page 500 502 503 504 /error/50x.html;
 
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;

install/deb/templates/web/nginx/php-fpm/joomla.tpl

@@ -36,9 +36,10 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
+    error_page 403 /error/404.html;
+    error_page 404 /error/404.html;
+    error_page 410 /error/410.html;
+    error_page 500 502 503 504 /error/50x.html;
 
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;

install/deb/templates/web/nginx/php-fpm/laravel.stpl

@@ -30,10 +30,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/laravel.tpl

@@ -27,10 +27,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/modx.stpl

@@ -43,10 +43,6 @@ server {
         include /etc/nginx/fastcgi_params;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/modx.tpl

@@ -42,10 +42,6 @@ server {
         include /etc/nginx/fastcgi_params;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/moodle.stpl

@@ -64,10 +64,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/moodle.tpl

@@ -64,10 +64,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/no-php.stpl

@@ -21,10 +21,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/no-php.tpl

@@ -20,10 +20,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/odoo.stpl

@@ -42,10 +42,6 @@ server {
         expires 864000;
         proxy_pass http://127.0.0.1:8069;
     }
-    
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
 
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;

install/deb/templates/web/nginx/php-fpm/odoo.tpl

@@ -42,10 +42,6 @@ server {
         proxy_pass http://127.0.0.1:8069;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/opencart.stpl

@@ -38,10 +38,6 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/opencart.tpl

@@ -36,10 +36,6 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/owncloud.stpl

@@ -27,6 +27,7 @@ server {
 
     error_page 403 = /core/templates/403.php;
     error_page 404 = /core/templates/404.php;
+    error_page 500 502 503 504 /error/50x.html;
 
     location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){
         deny all;
@@ -59,10 +60,6 @@ fastcgi_hide_header "Set-Cookie";
         add_header Cache-Control "public, must-revalidate, proxy-revalidate";
     }
 
-    #error_page  403 /error/404.html;
-    #error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/owncloud.tpl

@@ -26,6 +26,7 @@ server {
 
     error_page 403 = /core/templates/403.php;
     error_page 404 = /core/templates/404.php;
+    error_page 500 502 503 504 /error/50x.html;
 
     location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){
         deny all;
@@ -58,10 +59,6 @@ fastcgi_hide_header "Set-Cookie";
         add_header Cache-Control "public, must-revalidate, proxy-revalidate";
     }
 
-    #error_page  403 /error/404.html;
-    #error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/piwik.stpl

@@ -47,10 +47,6 @@ server {
             return 404;
         }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/piwik.tpl

@@ -46,10 +46,6 @@ server {
             return 404;
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/pyrocms.stpl

@@ -40,10 +40,6 @@ server {
     location ~ /\.          { access_log off; log_not_found off; deny all; }
     location ~ ~$           { access_log off; log_not_found off; deny all; }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/pyrocms.tpl

@@ -39,10 +39,6 @@ server {
     location ~ /\.          { access_log off; log_not_found off; deny all; }
     location ~ ~$           { access_log off; log_not_found off; deny all; }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/sendy.stpl

@@ -67,10 +67,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/sendy.tpl

@@ -67,10 +67,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/wordpress.stpl

@@ -46,10 +46,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }

install/deb/templates/web/nginx/php-fpm/wordpress.tpl

@@ -45,10 +45,6 @@ server {
         }
     }
 
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
     location /error/ {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }