From 8245ac8b1269128d21649e1852f52336421c9859 Mon Sep 17 00:00:00 2001
From: Cyb3r-Jak3 <git@Cyberjake.xyz>
Date: Thu, 23 Nov 2023 22:25:40 -0500
Subject: [PATCH 1/2] Update how HTTP/2 is enabled

---
 src/nginxconfig/generators/conf/website.conf.js | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/nginxconfig/generators/conf/website.conf.js b/src/nginxconfig/generators/conf/website.conf.js
index 5594301c..b82f93f6 100644
--- a/src/nginxconfig/generators/conf/website.conf.js
+++ b/src/nginxconfig/generators/conf/website.conf.js
@@ -71,12 +71,10 @@ const httpsListen = (domain, global, ipPortPairs) => {
     if (reusePortV4) ipPortPairs.add(ipPortV4);
 
     // HTTPS
-    config.push([
-        'listen',
-        `${ipPortV4} ssl${domain.https.http2.computed ? ' http2' : ''}${
-            reusePortV4 ? ' reuseport' : ''
-        }`,
-    ]);
+    config.push(['listen', `${ipPortV4} ssl${reusePortV4 ? ' reuseport' : ''}`]);
+
+    // HTTP/2
+    if (domain.https.http2.computed) config.push(['http2', 'on']);
 
     // HTTP/3
     if (domain.https.http3.computed) config.push(['listen', `${ipPortV4} http3`]);
@@ -89,12 +87,7 @@ const httpsListen = (domain, global, ipPortPairs) => {
         if (reusePortV6) ipPortPairs.add(ipPortV6);
 
         // HTTPS
-        config.push([
-            'listen',
-            `${ipPortV6} ssl${domain.https.http2.computed ? ' http2' : ''}${
-                reusePortV6 ? ' reuseport' : ''
-            }`,
-        ]);
+        config.push(['listen', `${ipPortV6} ssl${reusePortV6 ? ' reuseport' : ''}`]);
 
         // HTTP/3
         if (domain.https.http3.computed) config.push(['listen', `${ipPortV6} http3`]);

From 3c6c1ae56221d9408097c93fd9e9124183510c78 Mon Sep 17 00:00:00 2001
From: Cyb3r-Jak3 <git@Cyberjake.xyz>
Date: Mon, 27 Nov 2023 16:32:39 -0500
Subject: [PATCH 2/2] Change order of when http/2 is enabled

---
 src/nginxconfig/generators/conf/website.conf.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nginxconfig/generators/conf/website.conf.js b/src/nginxconfig/generators/conf/website.conf.js
index b82f93f6..25995c50 100644
--- a/src/nginxconfig/generators/conf/website.conf.js
+++ b/src/nginxconfig/generators/conf/website.conf.js
@@ -73,9 +73,6 @@ const httpsListen = (domain, global, ipPortPairs) => {
     // HTTPS
     config.push(['listen', `${ipPortV4} ssl${reusePortV4 ? ' reuseport' : ''}`]);
 
-    // HTTP/2
-    if (domain.https.http2.computed) config.push(['http2', 'on']);
-
     // HTTP/3
     if (domain.https.http3.computed) config.push(['listen', `${ipPortV4} http3`]);
 
@@ -93,6 +90,9 @@ const httpsListen = (domain, global, ipPortPairs) => {
         if (domain.https.http3.computed) config.push(['listen', `${ipPortV6} http3`]);
     }
 
+    // HTTP/2
+    if (domain.https.http2.computed) config.push(['http2', 'on']);
+
     return config;
 };