Update http2 syntax

This commit is contained in:
Ryan Cavicchioni 2024-04-14 17:30:59 -05:00
parent 4a7f888994
commit f79cdc1e59
4 changed files with 36 additions and 8 deletions

View File

@ -26,10 +26,13 @@ server {
{% if dl_ssl_enabled is defined and {% if dl_ssl_enabled is defined and
dl_ssl_enabled %} dl_ssl_enabled %}
server { server {
listen 443 ssl http2; listen 443 ssl;
{% if ansible_all_ipv6_addresses | length %} {% if ansible_all_ipv6_addresses | length %}
listen [::]:443 ssl http2; listen [::]:443 ssl;
{% endif %} {% endif %}
http2 on;
server_name {{ dl_server_name }}; server_name {{ dl_server_name }};
access_log {{ dl_access_log }} main; access_log {{ dl_access_log }} main;
error_log {{ dl_error_log }} warn; error_log {{ dl_error_log }} warn;
@ -46,6 +49,10 @@ server {
ssl_dhparam {{ dl_ssl_dhparam }}; ssl_dhparam {{ dl_ssl_dhparam }};
{% endif %} {% endif %}
location / {
add_header Alt-Svc 'h3=":$server_port"; ma=86400';
}
location ~ ^\/~(.+?)(\/.*)?$ { location ~ ^\/~(.+?)(\/.*)?$ {
alias /home/$1/public_html$2; alias /home/$1/public_html$2;
index index.html index.htm; index index.html index.htm;

View File

@ -37,10 +37,13 @@ server {
{% if gitea_ssl_enabled is defined and {% if gitea_ssl_enabled is defined and
gitea_ssl_enabled %} gitea_ssl_enabled %}
server { server {
listen 443 ssl http2; listen 443 ssl;
{% if ansible_all_ipv6_addresses | length %} {% if ansible_all_ipv6_addresses | length %}
listen [::]:443 ssl http2; listen [::]:443 ssl;
{% endif %} {% endif %}
http2 on;
server_name {{ gitea_domain }}; server_name {{ gitea_domain }};
access_log /var/log/nginx/gitea.access.log main; access_log /var/log/nginx/gitea.access.log main;
@ -62,6 +65,7 @@ server {
} }
location / { location / {
add_header Alt-Svc 'h3=":$server_port"; ma=86400';
limit_req zone=req_bad_actors burst=10 nodelay; limit_req zone=req_bad_actors burst=10 nodelay;
proxy_pass http://gitea_backend; proxy_pass http://gitea_backend;
} }

View File

@ -6,6 +6,11 @@ upstream grafana_backend {
server 127.0.0.1:{{ grafana_port }}; server 127.0.0.1:{{ grafana_port }};
} }
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
}
server { server {
listen 80; listen 80;
{% if ansible_all_ipv6_addresses | length %} {% if ansible_all_ipv6_addresses | length %}
@ -32,10 +37,13 @@ server {
{% if grafana_ssl_enabled is defined and {% if grafana_ssl_enabled is defined and
grafana_ssl_enabled %} grafana_ssl_enabled %}
server { server {
listen 443 ssl http2; listen 443 ssl;
{% if ansible_all_ipv6_addresses | length %} {% if ansible_all_ipv6_addresses | length %}
listen [::]:443 ssl http2; listen [::]:443 ssl;
{% endif %} {% endif %}
http2 on;
server_name {{ grafana_domain }}; server_name {{ grafana_domain }};
access_log /var/log/nginx/grafana.access.log main; access_log /var/log/nginx/grafana.access.log main;
@ -59,7 +67,12 @@ server {
} }
location / { location / {
add_header Alt-Svc 'h3=":$server_port"; ma=86400';
limit_req zone=req_bad_actors burst=10 nodelay; limit_req zone=req_bad_actors burst=10 nodelay;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_set_header Host $http_host;
proxy_pass http://grafana_backend; proxy_pass http://grafana_backend;
} }
} }

View File

@ -38,10 +38,13 @@ server {
{% if prometheus_ssl_enabled is defined and {% if prometheus_ssl_enabled is defined and
prometheus_ssl_enabled %} prometheus_ssl_enabled %}
server { server {
listen 443 ssl http2; listen 443 ssl;
{% if ansible_all_ipv6_addresses | length %} {% if ansible_all_ipv6_addresses | length %}
listen [::]:443 ssl http2; listen [::]:443 ssl;
{% endif %} {% endif %}
http2 on;
server_name {{ prometheus_hostname }}; server_name {{ prometheus_hostname }};
auth_basic "Prometheus"; auth_basic "Prometheus";
@ -73,6 +76,7 @@ server {
} }
location / { location / {
add_header Alt-Svc 'h3=":$server_port"; ma=86400';
return 301 /prometheus/; return 301 /prometheus/;
} }
} }