Skip to content

Commit c43929e

Browse files
authored
fix for Safari/iOS error NSPOSIXErrorDomain:100, part 2 (hestiacp#2274)
* fix for Safari/iOS error NSPOSIXErrorDomain:100, part 2 * fix: include ssl template in stpl files, not plain http
1 parent 1ed22cf commit c43929e

38 files changed

+83
-7
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,7 @@ server {
3939
proxy_pass https://%ip%:%web_ssl_port%;
4040
}
4141

42-
include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;
42+
proxy_hide_header Upgrade;
43+
44+
include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*;
4345
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@ server {
1818
location / {
1919
proxy_pass http://%ip%:%web_port%;
2020
}
21-
}
21+
22+
proxy_hide_header Upgrade;
23+
24+
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,7 @@ location @fallback {
3939
proxy_pass https://%ip%:%web_ssl_port%;
4040
}
4141

42-
include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;
42+
proxy_hide_header Upgrade;
43+
44+
include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*;
4345
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ server {
2525
alias /var/www/document_errors/;
2626
}
2727

28+
proxy_hide_header Upgrade;
2829

29-
include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
30+
include %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_*;
3031
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,7 @@ location /error/ {
4545
alias /var/www/document_errors/;
4646
}
4747

48-
include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
48+
proxy_hide_header Upgrade;
49+
50+
include %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_*;
4951
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,7 @@ server {
4040
alias /var/www/document_errors/;
4141
}
4242

43-
include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
43+
proxy_hide_header Upgrade;
44+
45+
include %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_*;
4446
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ server {
8181
include %home%/%user%/web/%domain%/stats/auth.conf*;
8282
}
8383

84+
proxy_hide_header Upgrade;
85+
8486
include /etc/nginx/conf.d/phpmyadmin.inc*;
8587
include /etc/nginx/conf.d/phppgadmin.inc*;
8688
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ server {
5353
include %home%/%user%/web/%domain%/stats/auth.conf*;
5454
}
5555

56+
proxy_hide_header Upgrade;
57+
5658
include /etc/nginx/conf.d/phpmyadmin.inc*;
5759
include /etc/nginx/conf.d/phppgadmin.inc*;
5860
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ server {
6666
include %home%/%user%/web/%domain%/stats/auth.conf*;
6767
}
6868

69+
proxy_hide_header Upgrade;
70+
6971
include /etc/nginx/conf.d/phpmyadmin.inc*;
7072
include /etc/nginx/conf.d/phppgadmin.inc*;
7173
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ server {
6060
include %home%/%user%/web/%domain%/stats/auth.conf*;
6161
}
6262

63+
proxy_hide_header Upgrade;
64+
6365
include /etc/nginx/conf.d/phpmyadmin.inc*;
6466
include /etc/nginx/conf.d/phppgadmin.inc*;
6567
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;

0 commit comments

Comments
 (0)