Browse Source

Update stpl files new ssl definition and enable http2 by default.

Raphael Schneeberger 7 years ago
parent
commit
4cc01fdb79
100 changed files with 89 additions and 160 deletions
  1. 1 2
      install/debian/8/multiphp/nginx/PHP-56.stpl
  2. 1 2
      install/debian/8/multiphp/nginx/PHP-70.stpl
  3. 1 2
      install/debian/8/multiphp/nginx/PHP-71.stpl
  4. 1 2
      install/debian/8/multiphp/nginx/PHP-72.stpl
  5. 1 2
      install/debian/8/multiphp/nginx/PHP-73.stpl
  6. 1 2
      install/debian/8/templates/web/nginx/caching.stpl
  7. 1 2
      install/debian/8/templates/web/nginx/default.stpl
  8. 1 2
      install/debian/8/templates/web/nginx/hosting.stpl
  9. 4 5
      install/debian/8/templates/web/nginx/http2.stpl
  10. 3 3
      install/debian/8/templates/web/nginx/http2.tpl
  11. 1 2
      install/debian/8/templates/web/nginx/php-fpm/cms_made_simple.stpl
  12. 0 0
      install/debian/8/templates/web/nginx/php-fpm/cms_made_simple.tpl
  13. 1 2
      install/debian/8/templates/web/nginx/php-fpm/codeigniter2.stpl
  14. 0 0
      install/debian/8/templates/web/nginx/php-fpm/codeigniter2.tpl
  15. 1 2
      install/debian/8/templates/web/nginx/php-fpm/codeigniter3.stpl
  16. 0 0
      install/debian/8/templates/web/nginx/php-fpm/codeigniter3.tpl
  17. 1 2
      install/debian/8/templates/web/nginx/php-fpm/datalife_engine.stpl
  18. 0 0
      install/debian/8/templates/web/nginx/php-fpm/datalife_engine.tpl
  19. 1 2
      install/debian/8/templates/web/nginx/php-fpm/default.stpl
  20. 0 0
      install/debian/8/templates/web/nginx/php-fpm/default.tpl
  21. 1 2
      install/debian/8/templates/web/nginx/php-fpm/dokuwiki.stpl
  22. 0 0
      install/debian/8/templates/web/nginx/php-fpm/dokuwiki.tpl
  23. 1 2
      install/debian/8/templates/web/nginx/php-fpm/drupal6.stpl
  24. 0 0
      install/debian/8/templates/web/nginx/php-fpm/drupal6.tpl
  25. 1 2
      install/debian/8/templates/web/nginx/php-fpm/drupal7.stpl
  26. 0 0
      install/debian/8/templates/web/nginx/php-fpm/drupal7.tpl
  27. 1 2
      install/debian/8/templates/web/nginx/php-fpm/drupal8.stpl
  28. 0 0
      install/debian/8/templates/web/nginx/php-fpm/drupal8.tpl
  29. 1 2
      install/debian/8/templates/web/nginx/php-fpm/joomla.stpl
  30. 0 0
      install/debian/8/templates/web/nginx/php-fpm/joomla.tpl
  31. 1 2
      install/debian/8/templates/web/nginx/php-fpm/laravel.stpl
  32. 0 0
      install/debian/8/templates/web/nginx/php-fpm/laravel.tpl
  33. 1 2
      install/debian/8/templates/web/nginx/php-fpm/magento.stpl
  34. 0 0
      install/debian/8/templates/web/nginx/php-fpm/magento.tpl
  35. 1 2
      install/debian/8/templates/web/nginx/php-fpm/modx.stpl
  36. 0 0
      install/debian/8/templates/web/nginx/php-fpm/modx.tpl
  37. 1 2
      install/debian/8/templates/web/nginx/php-fpm/moodle.stpl
  38. 0 0
      install/debian/8/templates/web/nginx/php-fpm/moodle.tpl
  39. 1 2
      install/debian/8/templates/web/nginx/php-fpm/no-php.stpl
  40. 0 0
      install/debian/8/templates/web/nginx/php-fpm/no-php.tpl
  41. 1 2
      install/debian/8/templates/web/nginx/php-fpm/odoo.stpl
  42. 0 0
      install/debian/8/templates/web/nginx/php-fpm/odoo.tpl
  43. 1 2
      install/debian/8/templates/web/nginx/php-fpm/opencart.stpl
  44. 0 0
      install/debian/8/templates/web/nginx/php-fpm/opencart.tpl
  45. 1 2
      install/debian/8/templates/web/nginx/php-fpm/owncloud.stpl
  46. 0 0
      install/debian/8/templates/web/nginx/php-fpm/owncloud.tpl
  47. 1 2
      install/debian/8/templates/web/nginx/php-fpm/piwik.stpl
  48. 0 0
      install/debian/8/templates/web/nginx/php-fpm/piwik.tpl
  49. 1 2
      install/debian/8/templates/web/nginx/php-fpm/pyrocms.stpl
  50. 0 0
      install/debian/8/templates/web/nginx/php-fpm/pyrocms.tpl
  51. 0 0
      install/debian/8/templates/web/nginx/php-fpm/sendy.stpl
  52. 0 0
      install/debian/8/templates/web/nginx/php-fpm/sendy.tpl
  53. 1 2
      install/debian/8/templates/web/nginx/php-fpm/wordpress.stpl
  54. 0 0
      install/debian/8/templates/web/nginx/php-fpm/wordpress.tpl
  55. 0 0
      install/debian/8/templates/web/php-fpm/default.tpl
  56. 0 0
      install/debian/8/templates/web/php-fpm/no-php.tpl
  57. 0 0
      install/debian/8/templates/web/php-fpm/socket.tpl
  58. 1 2
      install/debian/9/multiphp/nginx/PHP-56.stpl
  59. 1 2
      install/debian/9/multiphp/nginx/PHP-70.stpl
  60. 1 2
      install/debian/9/multiphp/nginx/PHP-71.stpl
  61. 1 2
      install/debian/9/multiphp/nginx/PHP-72.stpl
  62. 1 2
      install/debian/9/multiphp/nginx/PHP-73.stpl
  63. 1 2
      install/debian/9/templates/web/nginx/caching.stpl
  64. 1 2
      install/debian/9/templates/web/nginx/default.stpl
  65. 1 2
      install/debian/9/templates/web/nginx/hosting.stpl
  66. 4 5
      install/debian/9/templates/web/nginx/http2.stpl
  67. 3 3
      install/debian/9/templates/web/nginx/http2.tpl
  68. 1 2
      install/debian/9/templates/web/nginx/php-fpm/cms_made_simple.stpl
  69. 1 2
      install/debian/9/templates/web/nginx/php-fpm/codeigniter2.stpl
  70. 1 2
      install/debian/9/templates/web/nginx/php-fpm/codeigniter3.stpl
  71. 1 2
      install/debian/9/templates/web/nginx/php-fpm/datalife_engine.stpl
  72. 1 2
      install/debian/9/templates/web/nginx/php-fpm/default.stpl
  73. 1 2
      install/debian/9/templates/web/nginx/php-fpm/dokuwiki.stpl
  74. 1 2
      install/debian/9/templates/web/nginx/php-fpm/drupal6.stpl
  75. 1 2
      install/debian/9/templates/web/nginx/php-fpm/drupal7.stpl
  76. 1 2
      install/debian/9/templates/web/nginx/php-fpm/drupal8.stpl
  77. 1 2
      install/debian/9/templates/web/nginx/php-fpm/joomla.stpl
  78. 1 2
      install/debian/9/templates/web/nginx/php-fpm/laravel.stpl
  79. 1 2
      install/debian/9/templates/web/nginx/php-fpm/magento.stpl
  80. 1 2
      install/debian/9/templates/web/nginx/php-fpm/modx.stpl
  81. 1 2
      install/debian/9/templates/web/nginx/php-fpm/moodle.stpl
  82. 1 2
      install/debian/9/templates/web/nginx/php-fpm/no-php.stpl
  83. 1 2
      install/debian/9/templates/web/nginx/php-fpm/odoo.stpl
  84. 1 2
      install/debian/9/templates/web/nginx/php-fpm/opencart.stpl
  85. 1 2
      install/debian/9/templates/web/nginx/php-fpm/owncloud.stpl
  86. 1 2
      install/debian/9/templates/web/nginx/php-fpm/piwik.stpl
  87. 1 2
      install/debian/9/templates/web/nginx/php-fpm/pyrocms.stpl
  88. 1 2
      install/debian/9/templates/web/nginx/php-fpm/wordpress.stpl
  89. 1 2
      install/ubuntu/14.04/multiphp/nginx/PHP-56.stpl
  90. 1 2
      install/ubuntu/14.04/multiphp/nginx/PHP-70.stpl
  91. 1 2
      install/ubuntu/14.04/multiphp/nginx/PHP-71.stpl
  92. 1 2
      install/ubuntu/14.04/multiphp/nginx/PHP-72.stpl
  93. 1 2
      install/ubuntu/14.04/multiphp/nginx/PHP-73.stpl
  94. 1 2
      install/ubuntu/14.04/templates/web/nginx/caching.stpl
  95. 1 2
      install/ubuntu/14.04/templates/web/nginx/default.stpl
  96. 1 2
      install/ubuntu/14.04/templates/web/nginx/hosting.stpl
  97. 4 5
      install/ubuntu/14.04/templates/web/nginx/http2.stpl
  98. 3 3
      install/ubuntu/14.04/templates/web/nginx/http2.tpl
  99. 1 2
      install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl
  100. 1 2
      install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl

+ 1 - 2
install/debian/8/multiphp/nginx/PHP-56.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/8/multiphp/nginx/PHP-70.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/8/multiphp/nginx/PHP-71.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/8/multiphp/nginx/PHP-72.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/8/multiphp/nginx/PHP-73.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/8/templates/web/nginx/caching.stpl

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

+ 1 - 2
install/debian/8/templates/web/nginx/default.stpl

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

+ 1 - 2
install/debian/8/templates/web/nginx/hosting.stpl

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

+ 4 - 5
install/debian/8/templates/web/nginx/http2.stpl

@@ -1,17 +1,16 @@
 server {
-    listen      %ip%:%proxy_ssl_port% http2;
+    listen      %ip%:%proxy_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
-    error_log  /var/log/httpd/domains/%domain%.error.log error;
+    error_log  /var/log/apache2/domains/%domain%.error.log error;
 
     location / {
         proxy_pass      https://%ip%:%web_ssl_port%;
         location ~* ^.+\.(%proxy_extentions%)$ {
             root           %sdocroot%;
-            access_log     /var/log/httpd/domains/%domain%.log combined;
-            access_log     /var/log/httpd/domains/%domain%.bytes bytes;
+            access_log     /var/log/apache2/domains/%domain%.log combined;
+            access_log     /var/log/apache2/domains/%domain%.bytes bytes;
             expires        max;
             try_files      $uri @fallback;
         }

+ 3 - 3
install/debian/8/templates/web/nginx/http2.tpl

@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
-    error_log  /var/log/httpd/domains/%domain%.error.log error;
+    error_log  /var/log/apache2/domains/%domain%.error.log error;
 
     location / {
         proxy_pass      http://%ip%:%web_port%;
         location ~* ^.+\.(%proxy_extentions%)$ {
             root           %docroot%;
-            access_log     /var/log/httpd/domains/%domain%.log combined;
-            access_log     /var/log/httpd/domains/%domain%.bytes bytes;
+            access_log     /var/log/apache2/domains/%domain%.log combined;
+            access_log     /var/log/apache2/domains/%domain%.bytes bytes;
             expires        max;
             try_files      $uri @fallback;
         }

+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl → install/debian/8/templates/web/nginx/php-fpm/cms_made_simple.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl → install/debian/8/templates/web/nginx/php-fpm/cms_made_simple.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl → install/debian/8/templates/web/nginx/php-fpm/codeigniter2.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl → install/debian/8/templates/web/nginx/php-fpm/codeigniter2.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl → install/debian/8/templates/web/nginx/php-fpm/codeigniter3.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl → install/debian/8/templates/web/nginx/php-fpm/codeigniter3.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl → install/debian/8/templates/web/nginx/php-fpm/datalife_engine.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl → install/debian/8/templates/web/nginx/php-fpm/datalife_engine.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/default.stpl → install/debian/8/templates/web/nginx/php-fpm/default.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/default.tpl → install/debian/8/templates/web/nginx/php-fpm/default.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl → install/debian/8/templates/web/nginx/php-fpm/dokuwiki.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl → install/debian/8/templates/web/nginx/php-fpm/dokuwiki.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl → install/debian/8/templates/web/nginx/php-fpm/drupal6.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl → install/debian/8/templates/web/nginx/php-fpm/drupal6.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl → install/debian/8/templates/web/nginx/php-fpm/drupal7.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl → install/debian/8/templates/web/nginx/php-fpm/drupal7.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl → install/debian/8/templates/web/nginx/php-fpm/drupal8.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl → install/debian/8/templates/web/nginx/php-fpm/drupal8.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl → install/debian/8/templates/web/nginx/php-fpm/joomla.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl → install/debian/8/templates/web/nginx/php-fpm/joomla.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl → install/debian/8/templates/web/nginx/php-fpm/laravel.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%/public;
     index       index.php index.html index.htm;
@@ -8,7 +8,6 @@ server {
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
     

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl → install/debian/8/templates/web/nginx/php-fpm/laravel.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/magento.stpl → install/debian/8/templates/web/nginx/php-fpm/magento.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
 
     root        %sdocroot%/pub;
@@ -9,7 +9,6 @@ server {
     error_page  404 403 = /errors/404.php;
     add_header  "X-UA-Compatible" "IE=Edge";
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/magento.tpl → install/debian/8/templates/web/nginx/php-fpm/magento.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/modx.stpl → install/debian/8/templates/web/nginx/php-fpm/modx.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 #   if you need to rewrite www to non-www uncomment bellow

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/modx.tpl → install/debian/8/templates/web/nginx/php-fpm/modx.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl → install/debian/8/templates/web/nginx/php-fpm/moodle.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl → install/debian/8/templates/web/nginx/php-fpm/moodle.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl → install/debian/8/templates/web/nginx/php-fpm/no-php.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl → install/debian/8/templates/web/nginx/php-fpm/no-php.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/odoo.stpl → install/debian/8/templates/web/nginx/php-fpm/odoo.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/odoo.tpl → install/debian/8/templates/web/nginx/php-fpm/odoo.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/opencart.stpl → install/debian/8/templates/web/nginx/php-fpm/opencart.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/opencart.tpl → install/debian/8/templates/web/nginx/php-fpm/opencart.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl → install/debian/8/templates/web/nginx/php-fpm/owncloud.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl → install/debian/8/templates/web/nginx/php-fpm/owncloud.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl → install/debian/8/templates/web/nginx/php-fpm/piwik.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl → install/debian/8/templates/web/nginx/php-fpm/piwik.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl → install/debian/8/templates/web/nginx/php-fpm/pyrocms.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%/public;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl → install/debian/8/templates/web/nginx/php-fpm/pyrocms.tpl


+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/sendy.stpl → install/debian/8/templates/web/nginx/php-fpm/sendy.stpl


+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/sendy.tpl → install/debian/8/templates/web/nginx/php-fpm/sendy.tpl


+ 1 - 2
install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl → install/debian/8/templates/web/nginx/php-fpm/wordpress.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %docroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 0 - 0
install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl → install/debian/8/templates/web/nginx/php-fpm/wordpress.tpl


+ 0 - 0
install/debian/8/templates/web/php5-fpm/default.tpl → install/debian/8/templates/web/php-fpm/default.tpl


+ 0 - 0
install/debian/8/templates/web/php5-fpm/no-php.tpl → install/debian/8/templates/web/php-fpm/no-php.tpl


+ 0 - 0
install/debian/8/templates/web/php5-fpm/socket.tpl → install/debian/8/templates/web/php-fpm/socket.tpl


+ 1 - 2
install/debian/9/multiphp/nginx/PHP-56.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/multiphp/nginx/PHP-70.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/multiphp/nginx/PHP-71.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/multiphp/nginx/PHP-72.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/multiphp/nginx/PHP-73.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/caching.stpl

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

+ 1 - 2
install/debian/9/templates/web/nginx/default.stpl

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

+ 1 - 2
install/debian/9/templates/web/nginx/hosting.stpl

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

+ 4 - 5
install/debian/9/templates/web/nginx/http2.stpl

@@ -1,17 +1,16 @@
 server {
-    listen      %ip%:%proxy_ssl_port% http2;
+    listen      %ip%:%proxy_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
-    error_log  /var/log/httpd/domains/%domain%.error.log error;
+    error_log  /var/log/apache2/domains/%domain%.error.log error;
 
     location / {
         proxy_pass      https://%ip%:%web_ssl_port%;
         location ~* ^.+\.(%proxy_extentions%)$ {
             root           %sdocroot%;
-            access_log     /var/log/httpd/domains/%domain%.log combined;
-            access_log     /var/log/httpd/domains/%domain%.bytes bytes;
+            access_log     /var/log/apache2/domains/%domain%.log combined;
+            access_log     /var/log/apache2/domains/%domain%.bytes bytes;
             expires        max;
             try_files      $uri @fallback;
         }

+ 3 - 3
install/debian/9/templates/web/nginx/http2.tpl

@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
-    error_log  /var/log/httpd/domains/%domain%.error.log error;
+    error_log  /var/log/apache2/domains/%domain%.error.log error;
 
     location / {
         proxy_pass      http://%ip%:%web_port%;
         location ~* ^.+\.(%proxy_extentions%)$ {
             root           %docroot%;
-            access_log     /var/log/httpd/domains/%domain%.log combined;
-            access_log     /var/log/httpd/domains/%domain%.bytes bytes;
+            access_log     /var/log/apache2/domains/%domain%.log combined;
+            access_log     /var/log/apache2/domains/%domain%.bytes bytes;
             expires        max;
             try_files      $uri @fallback;
         }

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/cms_made_simple.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/codeigniter2.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/codeigniter3.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/datalife_engine.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/default.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/dokuwiki.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/drupal6.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/drupal7.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/drupal8.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/joomla.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/laravel.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%/public;
     index       index.php index.html index.htm;
@@ -8,7 +8,6 @@ server {
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
     

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/magento.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
 
     root        %sdocroot%/pub;
@@ -9,7 +9,6 @@ server {
     error_page  404 403 = /errors/404.php;
     add_header  "X-UA-Compatible" "IE=Edge";
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/modx.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 #   if you need to rewrite www to non-www uncomment bellow

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/moodle.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/no-php.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/odoo.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/opencart.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/owncloud.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/piwik.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/pyrocms.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%/public;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/debian/9/templates/web/nginx/php-fpm/wordpress.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %docroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/ubuntu/14.04/multiphp/nginx/PHP-56.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/ubuntu/14.04/multiphp/nginx/PHP-70.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/ubuntu/14.04/multiphp/nginx/PHP-71.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/ubuntu/14.04/multiphp/nginx/PHP-72.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/ubuntu/14.04/multiphp/nginx/PHP-73.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

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

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

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

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

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

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

+ 4 - 5
install/ubuntu/14.04/templates/web/nginx/http2.stpl

@@ -1,17 +1,16 @@
 server {
-    listen      %ip%:%proxy_ssl_port% http2;
+    listen      %ip%:%proxy_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
-    error_log  /var/log/httpd/domains/%domain%.error.log error;
+    error_log  /var/log/apache2/domains/%domain%.error.log error;
 
     location / {
         proxy_pass      https://%ip%:%web_ssl_port%;
         location ~* ^.+\.(%proxy_extentions%)$ {
             root           %sdocroot%;
-            access_log     /var/log/httpd/domains/%domain%.log combined;
-            access_log     /var/log/httpd/domains/%domain%.bytes bytes;
+            access_log     /var/log/apache2/domains/%domain%.log combined;
+            access_log     /var/log/apache2/domains/%domain%.bytes bytes;
             expires        max;
             try_files      $uri @fallback;
         }

+ 3 - 3
install/ubuntu/14.04/templates/web/nginx/http2.tpl

@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
-    error_log  /var/log/httpd/domains/%domain%.error.log error;
+    error_log  /var/log/apache2/domains/%domain%.error.log error;
 
     location / {
         proxy_pass      http://%ip%:%web_port%;
         location ~* ^.+\.(%proxy_extentions%)$ {
             root           %docroot%;
-            access_log     /var/log/httpd/domains/%domain%.log combined;
-            access_log     /var/log/httpd/domains/%domain%.bytes bytes;
+            access_log     /var/log/apache2/domains/%domain%.log combined;
+            access_log     /var/log/apache2/domains/%domain%.bytes bytes;
             expires        max;
             try_files      $uri @fallback;
         }

+ 1 - 2
install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

+ 1 - 2
install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl

@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%web_ssl_port%;
+    listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain_idn% %alias_idn%;
     root        %sdocroot%;
     index       index.php index.html index.htm;
@@ -7,7 +7,6 @@ server {
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
-    ssl         on;
     ssl_certificate      %ssl_pem%;
     ssl_certificate_key  %ssl_key%;
 

Some files were not shown because too many files changed in this diff