Skip to content

Commit 6ac1f72

Browse files
Merge pull request #2527 from bunkerity/staging
Road to 1.6.3-rc1 🚀
2 parents 95a46b1 + 2ae529a commit 6ac1f72

File tree

1,468 files changed

+8660
-251963
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,468 files changed

+8660
-251963
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ body:
4747
label: BunkerWeb version
4848
description: What version of BunkerWeb are you running?
4949
placeholder: Version
50-
value: 1.6.2-rc7
50+
value: 1.6.3-rc1
5151
validations:
5252
required: true
5353
- type: dropdown

.github/copilot-instructions.md

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Copilot Instructions for BunkerWeb
2+
3+
## Project Overview
4+
5+
- **BunkerWeb** is a next-generation, open-source Web Application Firewall (WAF) built on top of NGINX, with a modular, plugin-based architecture.
6+
- Major components: core (security logic), scheduler (configuration and job orchestration), web UI (management), plugin system (feature extension), and integrations (Docker, Kubernetes, Swarm, Linux, Azure).
7+
- Configuration is driven by environment variables (settings), custom NGINX/ModSecurity configs, and a backend database (SQLite, MariaDB, MySQL, PostgreSQL).
8+
9+
## Key Directories
10+
11+
- `src/`: Main source code (core, scheduler, plugins, UI, integrations)
12+
- `docs/`: Documentation, guides, and assets
13+
- `examples/`: Real-world configuration and deployment examples
14+
- `tests/`: Test scripts and scenarios
15+
- `misc/`: Utilities, scripts, and ASCII art
16+
17+
## Developer Workflows
18+
19+
- **Build/Run**: See `docs/quickstart-guide.md` and `README.md` for integration-specific instructions (Linux, Docker, Kubernetes, etc.).
20+
- **Testing**: Use scripts in `tests/` (e.g., `main.py`, `AutoconfTest.py`, `SwarmTest.py`).
21+
- **Debugging**: Logs and job execution are managed by the scheduler; use the web UI for live monitoring and troubleshooting.
22+
- **Plugins**: Add new features by placing plugins in the appropriate directory and updating settings. See `docs/plugins.md` and the [bunkerweb-plugins repo](https://github.com/bunkerity/bunkerweb-plugins).
23+
24+
## Project-Specific Conventions
25+
26+
- **Settings**: All configuration is via environment variables (e.g., `USE_ANTIBOT=captcha`). In multisite mode, prefix with the server name (e.g., `www.example.com_USE_ANTIBOT=captcha`).
27+
- **Multiple values**: Use numbered suffixes for repeated settings (e.g., `REVERSE_PROXY_URL_1`, `REVERSE_PROXY_URL_2`).
28+
- **Custom configs**: Place NGINX/ModSecurity customizations in designated config files or via the web UI.
29+
- **Localization**: UI translations in `src/ui/app/static/locales/`.
30+
31+
## Integration Patterns
32+
33+
- **Scheduler** is the central orchestrator for config, jobs, and service communication.
34+
- **Autoconf** listens for environment events (Docker, Swarm, Kubernetes) and updates config in real time.
35+
- **Web UI** interacts with the scheduler/database for live management.
36+
- **Plugins** extend core via settings and hooks; see plugin README files for details.
37+
38+
## Examples
39+
40+
- See `examples/` for integration and configuration samples.
41+
- See `src/common/core/` for core security modules (each with its own README).
42+
43+
## External Resources
44+
45+
- [Documentation](https://docs.bunkerweb.io)
46+
- [Web UI Demo](https://demo-ui.bunkerweb.io)
47+
- [Plugins](https://github.com/bunkerity/bunkerweb-plugins)
48+
49+
## Contributing
50+
51+
- Follow the [CONTRIBUTING.md](../CONTRIBUTING.md) and [SECURITY.md](../SECURITY.md) guidelines.
52+
- Use the [web UI](https://docs.bunkerweb.io/web-ui/) for most configuration and debugging tasks.
53+
54+
---
55+
56+
**Tip:** For new features, follow the patterns in `src/common/core/` and `src/ui/`. For integrations, reference the relevant subdirectory in `examples/` and `docs/`.

.github/workflows/1.5.yml

Lines changed: 0 additions & 243 deletions
This file was deleted.

.github/workflows/beta.yml

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -104,26 +104,14 @@ jobs:
104104
needs: [create-arm]
105105
strategy:
106106
matrix:
107-
linux:
108-
[
109-
ubuntu,
110-
debian,
111-
fedora-40,
112-
fedora-41,
113-
fedora-42,
114-
rhel,
115-
rhel9,
116-
ubuntu-jammy,
117-
]
107+
linux: [ubuntu, debian, fedora-41, fedora-42, rhel, rhel9, ubuntu-jammy]
118108
platforms: [linux/amd64, linux/arm64]
119109
include:
120110
- release: beta
121111
- linux: ubuntu
122112
package: deb
123113
- linux: debian
124114
package: deb
125-
- linux: fedora-40
126-
package: rpm
127115
- linux: fedora-41
128116
package: rpm
129117
- linux: fedora-42
@@ -216,17 +204,7 @@ jobs:
216204
needs: [wait-builds]
217205
strategy:
218206
matrix:
219-
linux:
220-
[
221-
ubuntu,
222-
debian,
223-
fedora-40,
224-
fedora-41,
225-
fedora-42,
226-
el,
227-
el9,
228-
ubuntu-jammy,
229-
]
207+
linux: [ubuntu, debian, fedora-41, fedora-42, el, el9, ubuntu-jammy]
230208
arch: [amd64, arm64]
231209
include:
232210
- release: beta
@@ -241,11 +219,6 @@ jobs:
241219
suffix: ""
242220
version: bookworm
243221
package: deb
244-
- linux: fedora-40
245-
separator: "-"
246-
suffix: "1."
247-
version: 40
248-
package: rpm
249222
- linux: fedora-41
250223
separator: "-"
251224
suffix: "1."
@@ -277,9 +250,6 @@ jobs:
277250
- linux: debian
278251
arch: amd64
279252
package_arch: amd64
280-
- linux: fedora-40
281-
arch: amd64
282-
package_arch: x86_64
283253
- linux: fedora-41
284254
arch: amd64
285255
package_arch: x86_64
@@ -301,9 +271,6 @@ jobs:
301271
- linux: debian
302272
arch: arm64
303273
package_arch: arm64
304-
- linux: fedora-40
305-
arch: arm64
306-
package_arch: aarch64
307274
- linux: fedora-41
308275
arch: arm64
309276
package_arch: aarch64

0 commit comments

Comments
 (0)