reuseport is not HTTP/3 only (#283)

* reuseport is not HTTP/3 only * Forgot to remove these * Move reuseport to global > https * Update i18n files * Only set reuseport once per ip:port pair * Move reuseport opt outside ssl conditional * Update copyright headers of touched files Co-authored-by: MattIPv4 <me@mattcowley.co.uk>
2025-11-05 10:46:10 +08:00 · 2021-06-28 12:51:45 +01:00
parent fee8fb4189
commit 5330055f2b
19 changed files with 103 additions and 88 deletions
--- a/src/nginxconfig/i18n/en/templates/domain_sections/https.js
+++ b/src/nginxconfig/i18n/en/templates/domain_sections/https.js
@@ -32,8 +32,6 @@ export default {
    enableHttp2Connections: `${common.enable} ${common.http}/2 connections`,
    http3: `${common.http}/3`,
    enableHttp3Connections: `${common.enable} ${common.http}/3 connections`,
-    portReuse: 'Reuseport',
-    enableReuseOfPort: `${common.enable} reuseport to generate a listening socket per worker`,
    forceHttps: `Force ${common.https}`,
    hsts: 'HSTS',
    enableStrictTransportSecurity: `${common.enable} Strict Transport Security, requiring HTTPS connections`,
--- a/src/nginxconfig/i18n/en/templates/global_sections/https.js
+++ b/src/nginxconfig/i18n/en/templates/global_sections/https.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DigitalOcean
+Copyright 2021 DigitalOcean

 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -33,6 +33,8 @@ const ipv6 = 'IPv6';
 export default {
    sslProfile: `${common.ssl} Profile`,
    httpsMustBeEnabledOnOneSite: `${common.https} must be enabled on at least one site to configure global ${common.https} settings.`,
+    portReuse: 'Reuseport',
+    enableReuseOfPort: `${common.enable} reuseport to generate a listening socket per worker`,
    ocspDnsResolvers: 'OCSP DNS Resolvers',
    cloudflareResolver: 'Cloudflare Resolver',
    googlePublicDns: 'Google Public DNS',
--- a/src/nginxconfig/i18n/fr/templates/domain_sections/https.js
+++ b/src/nginxconfig/i18n/fr/templates/domain_sections/https.js
@@ -32,8 +32,6 @@ export default {
    enableHttp2Connections: `${common.enable} les connexions ${common.http}/2`,
    http3: `${common.http}/3`,
    enableHttp3Connections: `${common.enable} les connexions ${common.http}/3`,
-    portReuse: 'Reuseport', // TODO: translate
-    enableReuseOfPort: `${common.enable} reuseport to generate a listening socket per worker`, // TODO: translate
    forceHttps: `Forcer ${common.https}`,
    hsts: 'HSTS',
    enableStrictTransportSecurity: `${common.enable} Strict Transport Security, exigeant HTTPS`,
--- a/src/nginxconfig/i18n/fr/templates/global_sections/https.js
+++ b/src/nginxconfig/i18n/fr/templates/global_sections/https.js
@@ -33,6 +33,8 @@ const ipv6 = 'IPv6';
 export default {
    sslProfile: `Profil ${common.ssl}`,
    httpsMustBeEnabledOnOneSite: `${common.https} doit être activé sur au moins un site pour configurer les paramètres ${common.https} globaux.`,
+    portReuse: 'Reuseport', // TODO: translate
+    enableReuseOfPort: `${common.enable} reuseport to generate a listening socket per worker`, // TODO: translate
    ocspDnsResolvers: 'Résolveur DNS OCSP',
    cloudflareResolver: 'Résolveur Cloudflare',
    googlePublicDns: 'Google Public DNS',
--- a/src/nginxconfig/i18n/pl/templates/domain_sections/https.js
+++ b/src/nginxconfig/i18n/pl/templates/domain_sections/https.js
@@ -32,8 +32,6 @@ export default {
    enableHttp2Connections: `${common.enable} połączenia ${common.http}/2`,
    http3: `${common.http}/3`,
    enableHttp3Connections: `${common.enable} połączenia ${common.http}/3`,
-    portReuse: 'Reuseport',
-    enableReuseOfPort: `${common.enable} reuseport aby generować listening socket per worker`,
    forceHttps: `Wymuś ${common.https}`,
    hsts: 'HSTS',
    enableStrictTransportSecurity: `${common.enable} Strict Transport Security, wymaga połaczenia HTTPS`,
--- a/src/nginxconfig/i18n/pl/templates/global_sections/https.js
+++ b/src/nginxconfig/i18n/pl/templates/global_sections/https.js
@@ -33,6 +33,8 @@ const ipv6 = 'IPv6';
 export default {
    sslProfile: `Profil ${common.ssl}`,
    httpsMustBeEnabledOnOneSite: `${common.https} musi być włączony na conajmniej jednej stronie, aby móc zastosować globalną konfigurację ${common.https}.`,
+    portReuse: 'Reuseport',
+    enableReuseOfPort: `${common.enable} reuseport aby generować listening socket per worker`,
    ocspDnsResolvers: 'OCSP DNS Resolvers',
    cloudflareResolver: 'Cloudflare Resolver',
    googlePublicDns: 'Google Public DNS',
--- a/src/nginxconfig/i18n/pt-br/templates/domain_sections/https.js
+++ b/src/nginxconfig/i18n/pt-br/templates/domain_sections/https.js
@@ -32,8 +32,6 @@ export default {
    enableHttp2Connections: `${common.enable} conexões ${common.http}/2`,
    http3: `${common.http}/3`,
    enableHttp3Connections: `${common.enable} conexões ${common.http}/3`,
-    portReuse: 'Reuseport', // TODO: translate
-    enableReuseOfPort: `${common.enable} reuseport to generate a listening socket per worker`, // TODO: translate
    forceHttps: `Forçar ${common.https}`,
    hsts: 'HSTS',
    enableStrictTransportSecurity: `${common.enable} Strict Transport Security, requerendo conexões HTTPS`,
--- a/src/nginxconfig/i18n/pt-br/templates/global_sections/https.js
+++ b/src/nginxconfig/i18n/pt-br/templates/global_sections/https.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DigitalOcean
+Copyright 2021 DigitalOcean

 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -33,6 +33,8 @@ const ipv6 = 'IPv6';
 export default {
    sslProfile: `Perfil ${common.ssl}`,
    httpsMustBeEnabledOnOneSite: `O ${common.https} deve estar habilitado em pelo menos um site para definir as configurações globais de ${common.https}.`,
+    portReuse: 'Reuseport', // TODO: translate
+    enableReuseOfPort: `${common.enable} reuseport to generate a listening socket per worker`, // TODO: translate
    ocspDnsResolvers: 'Resolvedores de DNS OCSP',
    cloudflareResolver: 'Resolvedor Cloudflare',
    googlePublicDns: 'DNS público do Google',
--- a/src/nginxconfig/i18n/ru/templates/domain_sections/https.js
+++ b/src/nginxconfig/i18n/ru/templates/domain_sections/https.js
@@ -32,8 +32,6 @@ export default {
    enableHttp2Connections: `${common.enable} ${common.http}/2 соединения`,
    http3: `${common.http}/3`,
    enableHttp3Connections: `${common.enable} ${common.http}/3 соединения`,
-    portReuse: 'Reuseport', // TODO: translate
-    enableReuseOfPort: `${common.enable} reuseport to generate a listening socket per worker`, // TODO: translate
    forceHttps: `Использовать только ${common.https}`,
    hsts: 'HSTS',
    enableStrictTransportSecurity: `${common.enable} Strict Transport Security, требующая HTTPS соединения`,
--- a/src/nginxconfig/i18n/ru/templates/global_sections/https.js
+++ b/src/nginxconfig/i18n/ru/templates/global_sections/https.js
@@ -33,6 +33,8 @@ const ipv6 = 'IPv6';
 export default {
    sslProfile: `${common.ssl} Профиль`,
    httpsMustBeEnabledOnOneSite: `${common.https} должен быть включен хотя бы на одном сайте, чтобы сконфигурировать глобальные ${common.https} настройки.`,
+    portReuse: 'Reuseport', // TODO: translate
+    enableReuseOfPort: `${common.enable} reuseport to generate a listening socket per worker`, // TODO: translate
    ocspDnsResolvers: 'OCSP DNS Преобразователи',
    cloudflareResolver: 'Cloudflare Преобразователь',
    googlePublicDns: 'Публичные Google DNS',
--- a/src/nginxconfig/i18n/zh-cn/templates/domain_sections/https.js
+++ b/src/nginxconfig/i18n/zh-cn/templates/domain_sections/https.js
@@ -32,8 +32,6 @@ export default {
    enableHttp2Connections: `${common.enable} ${common.http}/2 连接`,
    http3: `${common.http}/3`,
    enableHttp3Connections: `${common.enable} ${common.http}/3 连接`,
-    portReuse: '端口重用',
-    enableReuseOfPort: `${common.enable} 重用端口 为每个 NGINX Worker 单独生成一个监听套接字`,
    forceHttps: `强制 ${common.https}`,
    hsts: 'HSTS',
    enableStrictTransportSecurity: `${common.enable}HSTS（强制客户端、浏览器等使用 HTTPS 与服务器创建链接），需要HTTPS连接`,
--- a/src/nginxconfig/i18n/zh-cn/templates/global_sections/https.js
+++ b/src/nginxconfig/i18n/zh-cn/templates/global_sections/https.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DigitalOcean
+Copyright 2021 DigitalOcean

 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -33,6 +33,8 @@ const ipv6 = 'IPv6';
 export default {
    sslProfile: `${common.ssl}配置`,
    httpsMustBeEnabledOnOneSite: `必须在至少一个站点上启用${common.https}才能配置全局${common.https}设置。`,
+    portReuse: '端口重用',
+    enableReuseOfPort: `${common.enable} 重用端口 为每个 NGINX Worker 单独生成一个监听套接字`,
    ocspDnsResolvers: 'OCSP DNS解析器',
    cloudflareResolver: 'Cloudflare解析器',
    googlePublicDns: '谷歌公共DNS',
--- a/src/nginxconfig/i18n/zh-tw/templates/domain_sections/https.js
+++ b/src/nginxconfig/i18n/zh-tw/templates/domain_sections/https.js
@@ -32,8 +32,6 @@ export default {
    enableHttp2Connections: `${common.enable} ${common.http}/2 連接`,
    http3: `${common.http}/3`,
    enableHttp3Connections: `${common.enable} ${common.http}/3 連接`,
-    portReuse: '端口複用',
-    enableReuseOfPort: `${common.enable} 端口複用來為每個worker生成監聽套接字`,
    forceHttps: `強制 ${common.https}`,
    hsts: 'HSTS',
    enableStrictTransportSecurity: `${common.enable}HSTS（強制用戶端、瀏覽器等使用HTTPS與服務器創建連結），需要HTTPS連接`,
--- a/src/nginxconfig/i18n/zh-tw/templates/global_sections/https.js
+++ b/src/nginxconfig/i18n/zh-tw/templates/global_sections/https.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DigitalOcean
+Copyright 2021 DigitalOcean

 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -33,6 +33,8 @@ const ipv6 = 'IPv6';
 export default {
    sslProfile: `${common.ssl}配寘`,
    httpsMustBeEnabledOnOneSite: `必須在至少一個網站上啟用${common.https}才能配寘全域${common.https}設定。`,
+    portReuse: '端口複用',
+    enableReuseOfPort: `${common.enable} 端口複用來為每個worker生成監聽套接字`,
    ocspDnsResolvers: 'OCSP DNS解析器',
    cloudflareResolver: 'Cloudflare解析器',
    googlePublicDns: '穀歌公共DNS',