Просмотр исходного кода

Merge pull request #1810 from ifaist0s/master

Proposed fix for the use of a deprecated directive in nginx
Anton Reutov 7 лет назад
Родитель
Сommit
a09f097b3b

+ 1 - 2
install/ubuntu/16.04/templates/web/nginx/caching.stpl

@@ -1,7 +1,6 @@
 server {
 server {
-    listen      %ip%:%proxy_ssl_port%;
+    listen      %ip%:%proxy_ssl_port% ssl;
     server_name %domain_idn% %alias_idn%;
     server_name %domain_idn% %alias_idn%;
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
     ssl_certificate_key  %ssl_key%;
     error_log  /var/log/%web_system%/domains/%domain%.error.log error;
     error_log  /var/log/%web_system%/domains/%domain%.error.log error;

+ 1 - 2
install/ubuntu/16.04/templates/web/nginx/default.stpl

@@ -1,7 +1,6 @@
 server {
 server {
-    listen      %ip%:%proxy_ssl_port%;
+    listen      %ip%:%proxy_ssl_port% ssl;
     server_name %domain_idn% %alias_idn%;
     server_name %domain_idn% %alias_idn%;
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
     ssl_certificate_key  %ssl_key%;
     error_log  /var/log/%web_system%/domains/%domain%.error.log error;
     error_log  /var/log/%web_system%/domains/%domain%.error.log error;

+ 1 - 2
install/ubuntu/16.04/templates/web/nginx/hosting.stpl

@@ -1,7 +1,6 @@
 server {
 server {
-    listen      %ip%:%proxy_ssl_port%;
+    listen      %ip%:%proxy_ssl_port% ssl;
     server_name %domain_idn% %alias_idn%;
     server_name %domain_idn% %alias_idn%;
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
     ssl_certificate_key  %ssl_key%;
     error_log  /var/log/%web_system%/domains/%domain%.error.log error;
     error_log  /var/log/%web_system%/domains/%domain%.error.log error;

+ 1 - 2
install/ubuntu/16.04/templates/web/nginx/http2.stpl

@@ -1,7 +1,6 @@
 server {
 server {
-    listen      %ip%:%proxy_ssl_port% http2;
+    listen      %ip%:%proxy_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     server_name %domain_idn% %alias_idn%;
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
     ssl_certificate_key  %ssl_key%;
     error_log  /var/log/%web_system%/domains/%domain%.error.log error;
     error_log  /var/log/%web_system%/domains/%domain%.error.log error;