From 971421c8fad28d9d4339fd0cee4ccebb1cce60d5 Mon Sep 17 00:00:00 2001
From: Dmitry Verkhoturov <paskal.07@gmail.com>
Date: Thu, 30 May 2024 22:39:05 +0000
Subject: [PATCH] update nginx to 1.26

---
 config/nginx/conf.d/adminer.conf   | 2 +-
 config/nginx/conf.d/cdn.conf       | 4 ++--
 config/nginx/conf.d/dev-test.conf  | 2 +-
 config/nginx/conf.d/dev.conf       | 2 +-
 config/nginx/conf.d/hooks.conf     | 2 +-
 config/nginx/conf.d/prod.conf      | 6 +++---
 config/nginx/conf.d/redirects.conf | 4 ++--
 config/nginx/nginx.conf            | 4 +++-
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/config/nginx/conf.d/adminer.conf b/config/nginx/conf.d/adminer.conf
index 80bb098..d9bb039 100644
--- a/config/nginx/conf.d/adminer.conf
+++ b/config/nginx/conf.d/adminer.conf
@@ -1,5 +1,5 @@
 server {
-    listen 443 http2 ssl;
+    listen 443 ssl;
     ssl_certificate      /etc/nginx/letsencrypt/live/favor-group.ru/fullchain.pem;
     ssl_certificate_key  /etc/nginx/letsencrypt/live/favor-group.ru/privkey.pem;
     ssl_trusted_certificate /etc/nginx/letsencrypt/live/favor-group.ru/chain.pem;
diff --git a/config/nginx/conf.d/cdn.conf b/config/nginx/conf.d/cdn.conf
index 93289d5..c4ce1b5 100644
--- a/config/nginx/conf.d/cdn.conf
+++ b/config/nginx/conf.d/cdn.conf
@@ -5,7 +5,7 @@ map $http_origin $allow_origin {
 }
 
 server {
-    listen 443 http2 ssl;
+    listen 443 ssl;
 
     server_name static.cdn-favor-group.ru;
 
@@ -16,7 +16,7 @@ server {
 }
 
 server {
-    listen 443 http2 ssl;
+    listen 443 ssl;
 
     server_name dev.cdn-favor-group.ru;
 
diff --git a/config/nginx/conf.d/dev-test.conf b/config/nginx/conf.d/dev-test.conf
index 967c9f5..3c1369e 100644
--- a/config/nginx/conf.d/dev-test.conf
+++ b/config/nginx/conf.d/dev-test.conf
@@ -1,5 +1,5 @@
 server {
-    listen 443 http2 ssl;
+    listen 443 ssl;
 
     server_name dev-test.favor-group.ru;
 
diff --git a/config/nginx/conf.d/dev.conf b/config/nginx/conf.d/dev.conf
index 497b5f2..3029bc8 100644
--- a/config/nginx/conf.d/dev.conf
+++ b/config/nginx/conf.d/dev.conf
@@ -1,5 +1,5 @@
 server {
-    listen 443 http2 ssl;
+    listen 443 ssl;
 
     server_name dev.favor-group.ru;
 
diff --git a/config/nginx/conf.d/hooks.conf b/config/nginx/conf.d/hooks.conf
index 19b6964..efd29dc 100644
--- a/config/nginx/conf.d/hooks.conf
+++ b/config/nginx/conf.d/hooks.conf
@@ -1,5 +1,5 @@
 server {
-    listen 443 http2 ssl;
+    listen 443 ssl;
     server_name  hooks.favor-group.ru;
     location / {
         proxy_read_timeout 600;
diff --git a/config/nginx/conf.d/prod.conf b/config/nginx/conf.d/prod.conf
index 8e37214..b785b32 100644
--- a/config/nginx/conf.d/prod.conf
+++ b/config/nginx/conf.d/prod.conf
@@ -1,5 +1,5 @@
 server {
-    listen 443 http2 reuseport ssl;
+    listen 443 reuseport ssl;
 
     server_name favor-group.ru;
 
@@ -19,7 +19,7 @@ server {
 }
 
 server {
-    listen 443 http2 ssl;
+    listen 443 ssl;
 
     server_name spb.favor-group.ru;
 
@@ -39,7 +39,7 @@ server {
 }
 
 server {
-    listen 443 http2 ssl;
+    listen 443 ssl;
 
     server_name tula.favor-group.ru;
 
diff --git a/config/nginx/conf.d/redirects.conf b/config/nginx/conf.d/redirects.conf
index b8159ec..6973294 100644
--- a/config/nginx/conf.d/redirects.conf
+++ b/config/nginx/conf.d/redirects.conf
@@ -1,6 +1,6 @@
 # https www is a special case
 server {
-    listen 443 ssl http2;
+    listen 443 ssl;
     server_name  www.favor-group.ru;
     ssl_certificate      /etc/nginx/letsencrypt/live/favor-group.ru/fullchain.pem;
     ssl_certificate_key  /etc/nginx/letsencrypt/live/favor-group.ru/privkey.pem;
@@ -25,7 +25,7 @@ server {
 }
 
 server {
-    listen 443 default_server ssl http2;
+    listen 443 default_server ssl;
     ssl_certificate      /etc/nginx/letsencrypt/live/favor-group.ru/fullchain.pem;
     ssl_certificate_key  /etc/nginx/letsencrypt/live/favor-group.ru/privkey.pem;
     ssl_trusted_certificate /etc/nginx/letsencrypt/live/favor-group.ru/chain.pem;
diff --git a/config/nginx/nginx.conf b/config/nginx/nginx.conf
index f3ce16b..4456ef5 100644
--- a/config/nginx/nginx.conf
+++ b/config/nginx/nginx.conf
@@ -72,10 +72,12 @@ http {
     keepalive_requests              1000;
     # 0-RTT QUIC connection resumption
     ssl_early_data                  on;
+    # http2 everywhere
+    http2                           on;
 
     map $remote_addr $not_logging {
         default 1;
-	"158.101.196.116" 0;
+        "158.101.196.116" 0;
         # add your monitoring IPs there
     }