fix for Safari/iOS error NSPOSIXErrorDomain:100, part 2 (#2274)

* fix for Safari/iOS error NSPOSIXErrorDomain:100, part 2

* fix: include ssl template in stpl files, not plain http

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

@@ -39,5 +39,7 @@ server {
         proxy_pass https://%ip%:%web_ssl_port%;
     }
 
-    include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;
+    proxy_hide_header Upgrade;
+
+    include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*;
 }

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

@@ -18,4 +18,7 @@ server {
     location / {
         proxy_pass  http://%ip%:%web_port%;
     }
-}
+
+    proxy_hide_header Upgrade;
+
+}

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

@@ -39,5 +39,7 @@ location @fallback {
     proxy_pass https://%ip%:%web_ssl_port%;
 }
 
-include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;
+proxy_hide_header Upgrade;
+
+include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*;
 }

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

@@ -25,6 +25,7 @@ server {
     alias /var/www/document_errors/;
     }
 
+    proxy_hide_header Upgrade;
 
-    include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
+    include %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_*;
 }

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

@@ -45,5 +45,7 @@ location /error/ {
     alias /var/www/document_errors/;
 }
 
-include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
+proxy_hide_header Upgrade;
+
+include %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_*;
 }

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

@@ -40,5 +40,7 @@ server {
         alias /var/www/document_errors/;
     }
 
-    include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
+    proxy_hide_header Upgrade;
+
+    include %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_*;
 }

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

@@ -81,6 +81,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include /etc/nginx/conf.d/phpmyadmin.inc*;
     include /etc/nginx/conf.d/phppgadmin.inc*;
     include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -53,6 +53,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -66,6 +66,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include /etc/nginx/conf.d/phpmyadmin.inc*;
     include /etc/nginx/conf.d/phppgadmin.inc*;
     include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -60,6 +60,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include /etc/nginx/conf.d/phpmyadmin.inc*;
     include /etc/nginx/conf.d/phppgadmin.inc*;
     include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -125,6 +125,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -53,6 +53,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -70,6 +70,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

install/deb/templates/web/nginx/php-fpm/drupal-composer.stpl

@@ -96,6 +96,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

install/deb/templates/web/nginx/php-fpm/drupal-social.stpl

@@ -95,6 +95,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -105,6 +105,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -37,6 +37,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -57,7 +57,9 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
-}
+}

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

@@ -69,6 +69,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include /etc/nginx/conf.d/phpmyadmin.inc*;
     include /etc/nginx/conf.d/phppgadmin.inc*;
     include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -61,6 +61,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include /etc/nginx/conf.d/phpmyadmin.inc*;
     include /etc/nginx/conf.d/phppgadmin.inc*;
     include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -202,6 +202,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -77,6 +77,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include /etc/nginx/conf.d/phpmyadmin.inc*;
     include /etc/nginx/conf.d/phppgadmin.inc*;
     include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -81,6 +81,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -44,6 +44,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -62,6 +62,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -62,6 +62,8 @@ server {
        return 404;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -41,6 +41,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -89,6 +89,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

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

@@ -85,6 +85,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -71,6 +71,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -137,6 +137,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -84,6 +84,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -64,6 +64,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -85,6 +85,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include /etc/nginx/conf.d/phpmyadmin.inc*;
     include /etc/nginx/conf.d/phppgadmin.inc*;
     include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

install/deb/templates/web/nginx/php-fpm/symfony2-3.stpl

@@ -87,6 +87,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include /etc/nginx/conf.d/phpmyadmin.inc*;
     include /etc/nginx/conf.d/phppgadmin.inc*;
     include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

install/deb/templates/web/nginx/php-fpm/symfony4-5.stpl

@@ -61,6 +61,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include /etc/nginx/conf.d/phpmyadmin.inc*;
     include /etc/nginx/conf.d/phppgadmin.inc*;
     include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -84,6 +84,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

@@ -72,6 +72,8 @@ server {
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
+    proxy_hide_header Upgrade;
+
     include /etc/nginx/conf.d/phpmyadmin.inc*;
     include /etc/nginx/conf.d/phppgadmin.inc*;
     include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;