Skip to content

opnsense update#6

Merged
buixor merged 3 commits into
mainfrom
opnsense
May 21, 2026
Merged

opnsense update#6
buixor merged 3 commits into
mainfrom
opnsense

Conversation

@sabban
Copy link
Copy Markdown
Contributor

@sabban sabban commented May 21, 2026

opnsense update

@buixor
Copy link
Copy Markdown
Collaborator

buixor commented May 21, 2026

@copilot resolve the merge conflicts in this pull request

# Conflicts:
#	crowdsec/references/appsec/deploy.md
#	crowdsec/references/configure/acquisition.md
#	crowdsec/references/configure/bouncers/web-servers.md

Co-authored-by: buixor <990714+buixor@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented May 21, 2026

@copilot resolve the merge conflicts in this pull request

Merge conflicts resolved in commit a233644. The three conflicting files were merged as follows:

  • appsec/deploy.md: kept main's corrected Traefik plugin name (maxlerebourg/crowdsec-bouncer-traefik-plugin) and kept the opnsense branch's accurate Caddy entry with the critical two-handler note.
  • configure/acquisition.md: adopted main's improved structure (docker datasource, "When to pick" table, richer pitfalls) and incorporated all OPNsense-specific content (log paths table, poll_without_inotify for symlinked latest.log, SSH path pitfall, FreeBSD verify commands, OPNsense per-environment row).
  • configure/bouncers/web-servers.md: combined both Caddy build methods (Dockerfile for Linux/Docker; xcaddy for FreeBSD/OPNsense), both config formats (Caddyfile + JSON API), and merged pitfalls from both sides.

Copilot finished work on behalf of buixor May 21, 2026 16:12
Copilot AI requested a review from buixor May 21, 2026 16:12
@buixor buixor merged commit 007db2d into main May 21, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants