Skip to content

Commit 4cc01fd

Browse files
committed
Update stpl files new ssl definition and enable http2 by default.
1 parent d195d10 commit 4cc01fd

File tree

181 files changed

+180
-330
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+180
-330
lines changed

install/debian/8/multiphp/nginx/PHP-56.stpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
server {
2-
listen %ip%:%web_ssl_port%;
2+
listen %ip%:%web_ssl_port% ssl http2;
33
server_name %domain_idn% %alias_idn%;
44
root %sdocroot%;
55
index index.php index.html index.htm;
66
access_log /var/log/nginx/domains/%domain%.log combined;
77
access_log /var/log/nginx/domains/%domain%.bytes bytes;
88
error_log /var/log/nginx/domains/%domain%.error.log error;
99

10-
ssl on;
1110
ssl_certificate %ssl_pem%;
1211
ssl_certificate_key %ssl_key%;
1312

install/debian/8/multiphp/nginx/PHP-70.stpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
server {
2-
listen %ip%:%web_ssl_port%;
2+
listen %ip%:%web_ssl_port% ssl http2;
33
server_name %domain_idn% %alias_idn%;
44
root %sdocroot%;
55
index index.php index.html index.htm;
66
access_log /var/log/nginx/domains/%domain%.log combined;
77
access_log /var/log/nginx/domains/%domain%.bytes bytes;
88
error_log /var/log/nginx/domains/%domain%.error.log error;
99

10-
ssl on;
1110
ssl_certificate %ssl_pem%;
1211
ssl_certificate_key %ssl_key%;
1312

install/debian/8/multiphp/nginx/PHP-71.stpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
server {
2-
listen %ip%:%web_ssl_port%;
2+
listen %ip%:%web_ssl_port% ssl http2;
33
server_name %domain_idn% %alias_idn%;
44
root %sdocroot%;
55
index index.php index.html index.htm;
66
access_log /var/log/nginx/domains/%domain%.log combined;
77
access_log /var/log/nginx/domains/%domain%.bytes bytes;
88
error_log /var/log/nginx/domains/%domain%.error.log error;
99

10-
ssl on;
1110
ssl_certificate %ssl_pem%;
1211
ssl_certificate_key %ssl_key%;
1312

install/debian/8/multiphp/nginx/PHP-72.stpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
server {
2-
listen %ip%:%web_ssl_port%;
2+
listen %ip%:%web_ssl_port% ssl http2;
33
server_name %domain_idn% %alias_idn%;
44
root %sdocroot%;
55
index index.php index.html index.htm;
66
access_log /var/log/nginx/domains/%domain%.log combined;
77
access_log /var/log/nginx/domains/%domain%.bytes bytes;
88
error_log /var/log/nginx/domains/%domain%.error.log error;
99

10-
ssl on;
1110
ssl_certificate %ssl_pem%;
1211
ssl_certificate_key %ssl_key%;
1312

install/debian/8/multiphp/nginx/PHP-73.stpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
server {
2-
listen %ip%:%web_ssl_port%;
2+
listen %ip%:%web_ssl_port% ssl http2;
33
server_name %domain_idn% %alias_idn%;
44
root %sdocroot%;
55
index index.php index.html index.htm;
66
access_log /var/log/nginx/domains/%domain%.log combined;
77
access_log /var/log/nginx/domains/%domain%.bytes bytes;
88
error_log /var/log/nginx/domains/%domain%.error.log error;
99

10-
ssl on;
1110
ssl_certificate %ssl_pem%;
1211
ssl_certificate_key %ssl_key%;
1312

install/debian/8/templates/web/nginx/caching.stpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
server {
2-
listen %ip%:%proxy_ssl_port%;
2+
listen %ip%:%proxy_ssl_port% ssl http2;
33
server_name %domain_idn% %alias_idn%;
4-
ssl on;
54
ssl_certificate %ssl_pem%;
65
ssl_certificate_key %ssl_key%;
76
error_log /var/log/%web_system%/domains/%domain%.error.log error;

install/debian/8/templates/web/nginx/default.stpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
server {
2-
listen %ip%:%proxy_ssl_port%;
2+
listen %ip%:%proxy_ssl_port% ssl http2;
33
server_name %domain_idn% %alias_idn%;
4-
ssl on;
54
ssl_certificate %ssl_pem%;
65
ssl_certificate_key %ssl_key%;
76
error_log /var/log/%web_system%/domains/%domain%.error.log error;

install/debian/8/templates/web/nginx/hosting.stpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
server {
2-
listen %ip%:%proxy_ssl_port%;
2+
listen %ip%:%proxy_ssl_port% ssl http2;
33
server_name %domain_idn% %alias_idn%;
4-
ssl on;
54
ssl_certificate %ssl_pem%;
65
ssl_certificate_key %ssl_key%;
76
error_log /var/log/%web_system%/domains/%domain%.error.log error;

install/debian/8/templates/web/nginx/http2.stpl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
server {
2-
listen %ip%:%proxy_ssl_port% http2;
2+
listen %ip%:%proxy_ssl_port% ssl http2;
33
server_name %domain_idn% %alias_idn%;
4-
ssl on;
54
ssl_certificate %ssl_pem%;
65
ssl_certificate_key %ssl_key%;
7-
error_log /var/log/httpd/domains/%domain%.error.log error;
6+
error_log /var/log/apache2/domains/%domain%.error.log error;
87

98
location / {
109
proxy_pass https://%ip%:%web_ssl_port%;
1110
location ~* ^.+\.(%proxy_extentions%)$ {
1211
root %sdocroot%;
13-
access_log /var/log/httpd/domains/%domain%.log combined;
14-
access_log /var/log/httpd/domains/%domain%.bytes bytes;
12+
access_log /var/log/apache2/domains/%domain%.log combined;
13+
access_log /var/log/apache2/domains/%domain%.bytes bytes;
1514
expires max;
1615
try_files $uri @fallback;
1716
}

install/debian/8/templates/web/nginx/http2.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
server {
22
listen %ip%:%proxy_port%;
33
server_name %domain_idn% %alias_idn%;
4-
error_log /var/log/httpd/domains/%domain%.error.log error;
4+
error_log /var/log/apache2/domains/%domain%.error.log error;
55
66
location / {
77
proxy_pass http://%ip%:%web_port%;
88
location ~* ^.+\.(%proxy_extentions%)$ {
99
root %docroot%;
10-
access_log /var/log/httpd/domains/%domain%.log combined;
11-
access_log /var/log/httpd/domains/%domain%.bytes bytes;
10+
access_log /var/log/apache2/domains/%domain%.log combined;
11+
access_log /var/log/apache2/domains/%domain%.bytes bytes;
1212
expires max;
1313
try_files $uri @fallback;
1414
}

0 commit comments

Comments
 (0)