From c95d440cb3e271c06ec5e76ec7df48f779440e86 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Fri, 15 Dec 2023 21:11:49 +0200
Subject: [PATCH] Web proxy: Update the http2 directive.
It's not part of the listen directive anymore, it's now a separate
directive.
---
Compose/web-proxy/host01/conf.d/auth.shore.co.il.conf | 5 +++--
Compose/web-proxy/host01/conf.d/code.shore.co.il.conf | 5 +++--
Compose/web-proxy/host01/conf.d/git.shore.co.il.conf | 5 +++--
Compose/web-proxy/host01/conf.d/lam.shore.co.il.conf | 5 +++--
Compose/web-proxy/host01/conf.d/mail.shore.co.il.conf | 5 +++--
Compose/web-proxy/host01/conf.d/matrix.shore.co.il.conf | 5 +++--
Compose/web-proxy/host01/conf.d/nextcloud.shore.co.il.conf | 5 +++--
Compose/web-proxy/host01/conf.d/notify.shore.co.il.conf | 5 +++--
Compose/web-proxy/host01/conf.d/sogo.shore.co.il.conf | 5 +++--
Compose/web-proxy/host01/conf.d/vouch.shore.co.il.conf | 5 +++--
Compose/web-proxy/host01/conf.d/zpush.shore.co.il.conf | 5 +++--
Compose/web-proxy/kodi/conf.d/kodi.shore.co.il.conf | 5 +++--
Compose/web-proxy/kodi/conf.d/library.shore.co.il.conf | 5 +++--
Compose/web-proxy/kodi/conf.d/transmission.shore.co.il.conf | 5 +++--
Compose/web-proxy/ns4/conf.d/autoconfig.shore.co.il.conf | 5 +++--
Compose/web-proxy/ns4/conf.d/elasticsearch.shore.co.il.conf | 5 +++--
Compose/web-proxy/ns4/conf.d/kibana.shore.co.il.conf | 5 +++--
Compose/web-proxy/ns4/conf.d/myip.shore.co.il.conf | 5 +++--
Compose/web-proxy/ns4/conf.d/nehe.sr.conf | 5 +++--
Compose/web-proxy/ns4/conf.d/nehes.co.conf | 5 +++--
Compose/web-proxy/ns4/conf.d/registry.shore.co.il.conf | 5 +++--
Compose/web-proxy/ns4/conf.d/shore.co.il.conf | 5 +++--
Compose/web-proxy/ns4/conf.d/www.nehe.sr.conf | 5 +++--
Compose/web-proxy/ns4/conf.d/www.nehes.co.conf | 5 +++--
Compose/web-proxy/ns4/conf.d/www.shore.co.il.conf | 5 +++--
25 files changed, 75 insertions(+), 50 deletions(-)
diff --git a/Compose/web-proxy/host01/conf.d/auth.shore.co.il.conf b/Compose/web-proxy/host01/conf.d/auth.shore.co.il.conf
index 8e6e33e..e2052ee 100644
--- a/Compose/web-proxy/host01/conf.d/auth.shore.co.il.conf
+++ b/Compose/web-proxy/host01/conf.d/auth.shore.co.il.conf
@@ -16,8 +16,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name auth.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/host01/conf.d/code.shore.co.il.conf b/Compose/web-proxy/host01/conf.d/code.shore.co.il.conf
index 5c985d2..54934df 100644
--- a/Compose/web-proxy/host01/conf.d/code.shore.co.il.conf
+++ b/Compose/web-proxy/host01/conf.d/code.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name code.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/host01/conf.d/git.shore.co.il.conf b/Compose/web-proxy/host01/conf.d/git.shore.co.il.conf
index d408b7d..ec037e5 100644
--- a/Compose/web-proxy/host01/conf.d/git.shore.co.il.conf
+++ b/Compose/web-proxy/host01/conf.d/git.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name git.shore.co.il;
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/host01/conf.d/lam.shore.co.il.conf b/Compose/web-proxy/host01/conf.d/lam.shore.co.il.conf
index 2bb9eb2..ece1321 100644
--- a/Compose/web-proxy/host01/conf.d/lam.shore.co.il.conf
+++ b/Compose/web-proxy/host01/conf.d/lam.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name lam.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/host01/conf.d/mail.shore.co.il.conf b/Compose/web-proxy/host01/conf.d/mail.shore.co.il.conf
index fa99b28..e16619d 100644
--- a/Compose/web-proxy/host01/conf.d/mail.shore.co.il.conf
+++ b/Compose/web-proxy/host01/conf.d/mail.shore.co.il.conf
@@ -10,8 +10,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name mta-sts.shore.co.il mta-sts.nehe.sr;
root /var/www/mail.shore.co.il/;
include snippets/robots-disallow-all.conf;
diff --git a/Compose/web-proxy/host01/conf.d/matrix.shore.co.il.conf b/Compose/web-proxy/host01/conf.d/matrix.shore.co.il.conf
index 35decc7..ac2e07c 100644
--- a/Compose/web-proxy/host01/conf.d/matrix.shore.co.il.conf
+++ b/Compose/web-proxy/host01/conf.d/matrix.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name matrix.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/host01/conf.d/nextcloud.shore.co.il.conf b/Compose/web-proxy/host01/conf.d/nextcloud.shore.co.il.conf
index 33a9b73..2de292e 100644
--- a/Compose/web-proxy/host01/conf.d/nextcloud.shore.co.il.conf
+++ b/Compose/web-proxy/host01/conf.d/nextcloud.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name nextcloud.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/host01/conf.d/notify.shore.co.il.conf b/Compose/web-proxy/host01/conf.d/notify.shore.co.il.conf
index db9e761..4f0f0b9 100644
--- a/Compose/web-proxy/host01/conf.d/notify.shore.co.il.conf
+++ b/Compose/web-proxy/host01/conf.d/notify.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name notify.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/host01/conf.d/sogo.shore.co.il.conf b/Compose/web-proxy/host01/conf.d/sogo.shore.co.il.conf
index 189579f..09dcaa4 100644
--- a/Compose/web-proxy/host01/conf.d/sogo.shore.co.il.conf
+++ b/Compose/web-proxy/host01/conf.d/sogo.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name sogo.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/host01/conf.d/vouch.shore.co.il.conf b/Compose/web-proxy/host01/conf.d/vouch.shore.co.il.conf
index ec6ce8a..96dea20 100644
--- a/Compose/web-proxy/host01/conf.d/vouch.shore.co.il.conf
+++ b/Compose/web-proxy/host01/conf.d/vouch.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name vouch.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/host01/conf.d/zpush.shore.co.il.conf b/Compose/web-proxy/host01/conf.d/zpush.shore.co.il.conf
index aa25106..7415681 100644
--- a/Compose/web-proxy/host01/conf.d/zpush.shore.co.il.conf
+++ b/Compose/web-proxy/host01/conf.d/zpush.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name zpush.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/kodi/conf.d/kodi.shore.co.il.conf b/Compose/web-proxy/kodi/conf.d/kodi.shore.co.il.conf
index 215e67d..366b018 100644
--- a/Compose/web-proxy/kodi/conf.d/kodi.shore.co.il.conf
+++ b/Compose/web-proxy/kodi/conf.d/kodi.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name kodi.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/kodi/conf.d/library.shore.co.il.conf b/Compose/web-proxy/kodi/conf.d/library.shore.co.il.conf
index 99d9ed9..73e5384 100644
--- a/Compose/web-proxy/kodi/conf.d/library.shore.co.il.conf
+++ b/Compose/web-proxy/kodi/conf.d/library.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name library.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/kodi/conf.d/transmission.shore.co.il.conf b/Compose/web-proxy/kodi/conf.d/transmission.shore.co.il.conf
index 0fb970f..d17bf91 100644
--- a/Compose/web-proxy/kodi/conf.d/transmission.shore.co.il.conf
+++ b/Compose/web-proxy/kodi/conf.d/transmission.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name transmission.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/ns4/conf.d/autoconfig.shore.co.il.conf b/Compose/web-proxy/ns4/conf.d/autoconfig.shore.co.il.conf
index 9fb1103..5cc26ff 100644
--- a/Compose/web-proxy/ns4/conf.d/autoconfig.shore.co.il.conf
+++ b/Compose/web-proxy/ns4/conf.d/autoconfig.shore.co.il.conf
@@ -11,8 +11,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name autoconfig.shore.co.il autoconfig.nehe.sr;
root /var/www/autoconfig.shore.co.il/;
include snippets/robots-allow-all.conf;
diff --git a/Compose/web-proxy/ns4/conf.d/elasticsearch.shore.co.il.conf b/Compose/web-proxy/ns4/conf.d/elasticsearch.shore.co.il.conf
index 6a60200..77b5170 100644
--- a/Compose/web-proxy/ns4/conf.d/elasticsearch.shore.co.il.conf
+++ b/Compose/web-proxy/ns4/conf.d/elasticsearch.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name elasticsearch.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/ns4/conf.d/kibana.shore.co.il.conf b/Compose/web-proxy/ns4/conf.d/kibana.shore.co.il.conf
index 46edfee..3e4ba7b 100644
--- a/Compose/web-proxy/ns4/conf.d/kibana.shore.co.il.conf
+++ b/Compose/web-proxy/ns4/conf.d/kibana.shore.co.il.conf
@@ -13,8 +13,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name kibana.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/ns4/conf.d/myip.shore.co.il.conf b/Compose/web-proxy/ns4/conf.d/myip.shore.co.il.conf
index 222d2d4..be8757c 100644
--- a/Compose/web-proxy/ns4/conf.d/myip.shore.co.il.conf
+++ b/Compose/web-proxy/ns4/conf.d/myip.shore.co.il.conf
@@ -12,8 +12,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name myip.shore.co.il;
include snippets/robots-disallow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/ns4/conf.d/nehe.sr.conf b/Compose/web-proxy/ns4/conf.d/nehe.sr.conf
index 2b23fc1..eab2ecf 100644
--- a/Compose/web-proxy/ns4/conf.d/nehe.sr.conf
+++ b/Compose/web-proxy/ns4/conf.d/nehe.sr.conf
@@ -12,8 +12,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name nehe.sr;
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/ns4/conf.d/nehes.co.conf b/Compose/web-proxy/ns4/conf.d/nehes.co.conf
index 8cb6ecc..90b802c 100644
--- a/Compose/web-proxy/ns4/conf.d/nehes.co.conf
+++ b/Compose/web-proxy/ns4/conf.d/nehes.co.conf
@@ -12,8 +12,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name nehes.co;
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/ns4/conf.d/registry.shore.co.il.conf b/Compose/web-proxy/ns4/conf.d/registry.shore.co.il.conf
index d269372..bc228fc 100644
--- a/Compose/web-proxy/ns4/conf.d/registry.shore.co.il.conf
+++ b/Compose/web-proxy/ns4/conf.d/registry.shore.co.il.conf
@@ -11,8 +11,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name registry.shore.co.il;
include snippets/ssl-modern.conf;
diff --git a/Compose/web-proxy/ns4/conf.d/shore.co.il.conf b/Compose/web-proxy/ns4/conf.d/shore.co.il.conf
index af5858a..f734ded 100644
--- a/Compose/web-proxy/ns4/conf.d/shore.co.il.conf
+++ b/Compose/web-proxy/ns4/conf.d/shore.co.il.conf
@@ -16,8 +16,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name shore.co.il;
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/ns4/conf.d/www.nehe.sr.conf b/Compose/web-proxy/ns4/conf.d/www.nehe.sr.conf
index 414cd4d..9a73996 100644
--- a/Compose/web-proxy/ns4/conf.d/www.nehe.sr.conf
+++ b/Compose/web-proxy/ns4/conf.d/www.nehe.sr.conf
@@ -11,8 +11,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name www.nehe.sr;
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/ns4/conf.d/www.nehes.co.conf b/Compose/web-proxy/ns4/conf.d/www.nehes.co.conf
index fdd0d5b..647b8f4 100644
--- a/Compose/web-proxy/ns4/conf.d/www.nehes.co.conf
+++ b/Compose/web-proxy/ns4/conf.d/www.nehes.co.conf
@@ -11,8 +11,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name www.nehes.co;
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
diff --git a/Compose/web-proxy/ns4/conf.d/www.shore.co.il.conf b/Compose/web-proxy/ns4/conf.d/www.shore.co.il.conf
index d496c2d..18b5e16 100644
--- a/Compose/web-proxy/ns4/conf.d/www.shore.co.il.conf
+++ b/Compose/web-proxy/ns4/conf.d/www.shore.co.il.conf
@@ -16,8 +16,9 @@ server {
}
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
server_name www.shore.co.il;
include snippets/robots-allow-all.conf;
include snippets/ads-txt.conf;
--
GitLab