diff --git a/www/caddy/Makefile b/www/caddy/Makefile index 4264cd9b0..ebfe26f13 100644 --- a/www/caddy/Makefile +++ b/www/caddy/Makefile @@ -1,5 +1,6 @@ PLUGIN_NAME= caddy PLUGIN_VERSION= 1.8.0 +PLUGIN_REVISION= 1 PLUGIN_DEPENDS= caddy-custom PLUGIN_COMMENT= Modern Reverse Proxy with Automatic HTTPS, Dynamic DNS and Layer4 Routing PLUGIN_MAINTAINER= cedrik@pischem.com diff --git a/www/caddy/pkg-descr b/www/caddy/pkg-descr index 65e926dd6..716a22aa4 100644 --- a/www/caddy/pkg-descr +++ b/www/caddy/pkg-descr @@ -22,6 +22,7 @@ Plugin Changelog dinahosting, civo, easydns, hosttech; must be added via https://caddyserver.com/docs/command-line#caddy-add-package * Cleanup: Refactor caddy.inc and add syslog function, change name from Caddy Web Server to Caddy (opnsense/plugins/issues/4426) * Cleanup: Some small UI tweaks (opnsense/plugins/pull/4442) +* Change: Disable HTTP/3 to mitigate status 400 issue when reverse proxying the OPNsense WebGUI (opnsense/plugins/issues/4471) 1.7.6 diff --git a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/general.xml b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/general.xml index 488c9aeb2..60d604eaf 100644 --- a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/general.xml +++ b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/general.xml @@ -33,10 +33,10 @@ - caddy.general.HttpVersion - + caddy.general.HttpVersions + select_multiple - + caddy.general.HttpPort diff --git a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml index 5fd4bf000..70f09cc37 100644 --- a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml +++ b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml @@ -1,7 +1,7 @@ //Pischem/caddy Caddy Reverse Proxy - 1.3.3 + 1.3.4 @@ -98,16 +98,16 @@ Please enter a valid Grace Period between 1 and 20 seconds. Y - + Y - h1,h2,h3 + h1,h2 Y

HTTP/1.1

HTTP/2

HTTP/3

-
+ diff --git a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile index 320eb8619..1e452f62c 100644 --- a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile +++ b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile @@ -81,7 +81,7 @@ {% endif %} servers { - protocols {{ generalSettings.HttpVersion.split(',') | join(' ') }} + protocols {{ generalSettings.HttpVersions.split(',') | join(' ') }} {% if accessList %} trusted_proxies static {{ accessList.clientIps.split(',') | join(' ') }} {% endif %}