akanealw/Charon
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix: update Caddy version to 2.11.2 in architecture and compatibility matrix for consistency

Browse Source
This commit is contained in:
GitHub Actions
2026-03-06 02:56:31 +00:00
parent 2266a8d051
commit 635caf0f9a
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/instructions/ARCHITECTURE.instructions.md
+1 -1
View File
@@ -126,7 +126,7 @@ graph TB
| **HTTP Framework** | Gin | Latest | Routing, middleware, HTTP handling | | **HTTP Framework** | Gin | Latest | Routing, middleware, HTTP handling |
| **Database** | SQLite | 3.x | Embedded database | | **Database** | SQLite | 3.x | Embedded database |
| **ORM** | GORM | Latest | Database abstraction layer | | **ORM** | GORM | Latest | Database abstraction layer |
| **Reverse Proxy** | Caddy Server | 2.11.1 | Embedded HTTP/HTTPS proxy | | **Reverse Proxy** | Caddy Server | 2.11.2 | Embedded HTTP/HTTPS proxy |
| **WebSocket** | gorilla/websocket | Latest | Real-time log streaming | | **WebSocket** | gorilla/websocket | Latest | Real-time log streaming |
| **Crypto** | golang.org/x/crypto | Latest | Password hashing, encryption | | **Crypto** | golang.org/x/crypto | Latest | Password hashing, encryption |
| **Metrics** | Prometheus Client | Latest | Application metrics | | **Metrics** | Prometheus Client | Latest | Application metrics |
.vscode/tasks.json
Vendored
+1 -1
View File
@@ -727,7 +727,7 @@
{ {
"label": "Security: Caddy PR-1 Compatibility Matrix", "label": "Security: Caddy PR-1 Compatibility Matrix",
"type": "shell", "type": "shell",
"command": "cd /projects/Charon && bash scripts/caddy-compat-matrix.sh --candidate-version 2.11.1 --patch-scenarios A,B,C --platforms linux/amd64,linux/arm64 --smoke-set boot_caddy,plugin_modules,config_validate,admin_api_health --output-dir test-results/caddy-compat --docs-report docs/reports/caddy-compatibility-matrix.md", "command": "cd /projects/Charon && bash scripts/caddy-compat-matrix.sh --candidate-version 2.11.2 --patch-scenarios A,B,C --platforms linux/amd64,linux/arm64 --smoke-set boot_caddy,plugin_modules,config_validate,admin_api_health --output-dir test-results/caddy-compat --docs-report docs/reports/caddy-compatibility-matrix.md",
"group": "test", "group": "test",
"problemMatcher": [] "problemMatcher": []
}, },
ARCHITECTURE.md
+1 -1
View File
@@ -126,7 +126,7 @@ graph TB
| **HTTP Framework** | Gin | Latest | Routing, middleware, HTTP handling | | **HTTP Framework** | Gin | Latest | Routing, middleware, HTTP handling |
| **Database** | SQLite | 3.x | Embedded database | | **Database** | SQLite | 3.x | Embedded database |
| **ORM** | GORM | Latest | Database abstraction layer | | **ORM** | GORM | Latest | Database abstraction layer |
| **Reverse Proxy** | Caddy Server | 2.11.1 | Embedded HTTP/HTTPS proxy | | **Reverse Proxy** | Caddy Server | 2.11.2 | Embedded HTTP/HTTPS proxy |
| **WebSocket** | gorilla/websocket | Latest | Real-time log streaming | | **WebSocket** | gorilla/websocket | Latest | Real-time log streaming |
| **Crypto** | golang.org/x/crypto | Latest | Password hashing, encryption | | **Crypto** | golang.org/x/crypto | Latest | Password hashing, encryption |
| **Metrics** | Prometheus Client | Latest | Application metrics | | **Metrics** | Prometheus Client | Latest | Application metrics |
Dockerfile
+3 -3
View File
@@ -14,9 +14,9 @@ ARG BUILD_DEBUG=0
# avoid accidentally pulling a v3 major release. Renovate can still update # avoid accidentally pulling a v3 major release. Renovate can still update
# this ARG to a specific v2.x tag when desired. # this ARG to a specific v2.x tag when desired.
## Try to build the requested Caddy v2.x tag (Renovate can update this ARG). ## Try to build the requested Caddy v2.x tag (Renovate can update this ARG).
## If the requested tag isn't available, fall back to a known-good v2.11.1 build. ## If the requested tag isn't available, fall back to a known-good v2.11.2 build.
ARG CADDY_VERSION=2.11.1 ARG CADDY_VERSION=2.11.2
ARG CADDY_CANDIDATE_VERSION=2.11.1 ARG CADDY_CANDIDATE_VERSION=2.11.2
ARG CADDY_USE_CANDIDATE=0 ARG CADDY_USE_CANDIDATE=0
ARG CADDY_PATCH_SCENARIO=B ARG CADDY_PATCH_SCENARIO=B
# renovate: datasource=go depName=github.com/greenpau/caddy-security # renovate: datasource=go depName=github.com/greenpau/caddy-security
docs/reports/caddy-compatibility-matrix.md
+1 -1
View File
@@ -1,7 +1,7 @@
# PR-1 Caddy Compatibility Matrix Report # PR-1 Caddy Compatibility Matrix Report
- Generated at: 2026-02-23T13:52:26Z - Generated at: 2026-02-23T13:52:26Z
- Candidate Caddy version: 2.11.1 - Candidate Caddy version: 2.11.2
- Plugin set: caddy-security,coraza-caddy,caddy-crowdsec-bouncer,caddy-geoip2,caddy-ratelimit - Plugin set: caddy-security,coraza-caddy,caddy-crowdsec-bouncer,caddy-geoip2,caddy-ratelimit
- Smoke set: boot_caddy,plugin_modules,config_validate,admin_api_health - Smoke set: boot_caddy,plugin_modules,config_validate,admin_api_health
- Matrix dimensions: patch scenario × platform/arch × checked plugin modules - Matrix dimensions: patch scenario × platform/arch × checked plugin modules
docs/reports/caddy-security-posture.md
+1 -1
View File
@@ -2,7 +2,7 @@
- Date: 2026-02-23 - Date: 2026-02-23
- Scope: PR-2 only (security patch posture + xcaddy patch retirement decision) - Scope: PR-2 only (security patch posture + xcaddy patch retirement decision)
- Upstream target: Caddy 2.11.x line (`2.11.1` candidate in this repository) - Upstream target: Caddy 2.11.x line (`2.11.2` candidate in this repository)
- Inputs: - Inputs:
- PR-1 compatibility matrix: `docs/reports/caddy-compatibility-matrix.md` - PR-1 compatibility matrix: `docs/reports/caddy-compatibility-matrix.md`
- Plan authority: `docs/plans/current_spec.md` - Plan authority: `docs/plans/current_spec.md`
scripts/caddy-compat-matrix.sh
+2 -2
View File
@@ -2,7 +2,7 @@
set -euo pipefail set -euo pipefail
readonly DEFAULT_CANDIDATE_VERSION="2.11.1" readonly DEFAULT_CANDIDATE_VERSION="2.11.2"
readonly DEFAULT_PATCH_SCENARIOS="A,B,C" readonly DEFAULT_PATCH_SCENARIOS="A,B,C"
readonly DEFAULT_PLATFORMS="linux/amd64,linux/arm64" readonly DEFAULT_PLATFORMS="linux/amd64,linux/arm64"
readonly DEFAULT_PLUGIN_SET="caddy-security,coraza-caddy,caddy-crowdsec-bouncer,caddy-geoip2,caddy-ratelimit" readonly DEFAULT_PLUGIN_SET="caddy-security,coraza-caddy,caddy-crowdsec-bouncer,caddy-geoip2,caddy-ratelimit"
@@ -33,7 +33,7 @@ Usage: scripts/caddy-compat-matrix.sh [options]
Options: Options:
--output-dir <path> Output directory (default: test-results/caddy-compat) --output-dir <path> Output directory (default: test-results/caddy-compat)
--docs-report <path> Markdown report path (default: docs/reports/caddy-compatibility-matrix.md) --docs-report <path> Markdown report path (default: docs/reports/caddy-compatibility-matrix.md)
--candidate-version <ver> Candidate Caddy version (default: 2.11.1) --candidate-version <ver> Candidate Caddy version (default: 2.11.2)
--patch-scenarios <csv> Patch scenarios CSV (default: A,B,C) --patch-scenarios <csv> Patch scenarios CSV (default: A,B,C)
--platforms <csv> Platforms CSV (default: linux/amd64,linux/arm64) --platforms <csv> Platforms CSV (default: linux/amd64,linux/arm64)
--plugin-set <csv> Plugin set descriptor for report metadata --plugin-set <csv> Plugin set descriptor for report metadata