Skip to content

Commit 52a7b7d

Browse files
authored
Merge pull request #5593 from NginxProxyManager/develop
v2.15.0
2 parents 84fb272 + 8e042ba commit 52a7b7d

111 files changed

Lines changed: 6086 additions & 4146 deletions

File tree

Some content is hidden

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

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<!-- WARNING: Any PR without a description will be closed. The title is not enough! -->
2+
3+
<!-- ANOTHER WARNING: Don't go creating a duplicate PR! Check that someone hasn't already created something that tackles your fix and if so, help them first -->
4+
5+
## Why
6+
7+
<!-- Provide a brief description of WHY you are making your changes -->
8+
9+
<!-- Consider if you are changing the API, then go in to detail why and/or if
10+
you change will break API for existing users -->
11+
12+
## Type of Change
13+
14+
<!-- Mark the relevant options with an "x" -->
15+
16+
- [ ] Bug fix (non-breaking change that fixes an issue)
17+
- [ ] New feature (non-breaking change that adds functionality)
18+
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
19+
- [ ] Documentation update
20+
- [ ] Code refactoring
21+
- [ ] API changes
22+
- [ ] Performance improvement
23+
- [ ] Test addition or update
24+
25+
## AI Usage
26+
27+
<!-- Mark the relevant options with an "x" -->
28+
29+
- [ ] AI was used to write this
30+
- [ ] AI was used to review this
31+

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ test/node_modules
88
*/node_modules
99
docker/dev/dnsrouter-config.json.tmp
1010
docker/dev/resolv.conf
11+
.claude
12+

.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.14.0
1+
2.15.0

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<p align="center">
22
<img src="https://nginxproxymanager.com/github.png">
33
<br><br>
4-
<img src="https://img.shields.io/badge/version-2.14.0-green.svg?style=for-the-badge">
4+
<img src="https://img.shields.io/badge/version-2.15.0-green.svg?style=for-the-badge">
55
<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
66
<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
77
</a>
@@ -10,7 +10,7 @@
1010
</a>
1111
</p>
1212

13-
This project comes as a pre-built docker image that enables you to easily forward to your websites
13+
This project comes as a pre-built Docker image that enables you to easily forward to your websites
1414
running at home or otherwise, including free SSL, without having to know too much about Nginx or Letsencrypt.
1515

1616
- [Quick Setup](#quick-setup)
@@ -20,21 +20,21 @@ running at home or otherwise, including free SSL, without having to know too muc
2020
## Project Goal
2121

2222
I created this project to fill a personal need to provide users with an easy way to accomplish reverse
23-
proxying hosts with SSL termination and it had to be so easy that a monkey could do it. This goal hasn't changed.
24-
While there might be advanced options they are optional and the project should be as simple as possible
25-
so that the barrier for entry here is low.
23+
proxying hosts with SSL termination, and it had to be so easy that a monkey could do it. This goal hasn't changed.
24+
While there might be advanced options, they are optional, and the project should be as simple as possible
25+
so that the barrier to entry here is low.
2626

2727
<a href="https://www.buymeacoffee.com/jc21" target="_blank"><img src="http://public.jc21.com/github/by-me-a-coffee.png" alt="Buy Me A Coffee" style="height: 51px !important;width: 217px !important;" ></a>
2828

2929

3030
## Features
3131

3232
- Beautiful and Secure Admin Interface based on [Tabler](https://tabler.github.io/)
33-
- Easily create forwarding domains, redirections, streams and 404 hosts without knowing anything about Nginx
33+
- Easily create forwarding domains, redirections, streams, and 404 hosts without knowing anything about Nginx
3434
- Free SSL using Let's Encrypt or provide your own custom SSL certificates
3535
- Access Lists and basic HTTP Authentication for your hosts
3636
- Advanced Nginx configuration available for super users
37-
- User management, permissions and audit log
37+
- User management, permissions, and audit log
3838

3939
::: warning
4040
`armv7` is no longer supported in version 2.14+. This is due to Nodejs dropping support for armhf. Please
@@ -43,15 +43,15 @@ use the `2.13.7` image tag if this applies to you.
4343

4444
## Hosting your home network
4545

46-
I won't go in to too much detail here but here are the basics for someone new to this self-hosted world.
46+
I won't go into too much detail here, but here are the basics for someone new to this self-hosted world.
4747

4848
1. Your home router will have a Port Forwarding section somewhere. Log in and find it
49-
2. Add port forwarding for port 80 and 443 to the server hosting this project
49+
2. Add port forwarding for ports 80 and 443 to the server hosting this project
5050
3. Configure your domain name details to point to your home, either with a static ip or a service like
5151
- DuckDNS
5252
- [Amazon Route53](https://github.com/jc21/route53-ddns)
5353
- [Cloudflare](https://github.com/jc21/cloudflare-ddns)
54-
4. Use the Nginx Proxy Manager as your gateway to forward to your other web based services
54+
4. Use the Nginx Proxy Manager as your gateway to forward to your other web-based services
5555

5656
## Quick Setup
5757

SECURITY.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
Only the latest stable release receives security updates.
6+
Older versions are not actively maintained.
7+
8+
| Version | Supported |
9+
| ------- | --------- |
10+
| 2.15.x (latest) | :white_check_mark: |
11+
| < 2.15.0 | :x: |
12+
13+
Docker images: `jc21/nginx-proxy-manager:latest`, `jc21/nginx-proxy-manager:2`
14+
15+
See all releases: https://github.com/NginxProxyManager/nginx-proxy-manager/releases
16+
17+
## Reporting a Vulnerability
18+
19+
**Do NOT open a public GitHub Issue to report a security vulnerability.**
20+
21+
Use GitHub's private vulnerability reporting:
22+
https://github.com/NginxProxyManager/nginx-proxy-manager/security/advisories/new
23+
24+
Please include:
25+
- Affected version (Docker image tag or release)
26+
- Description of the vulnerability
27+
- Steps to reproduce
28+
- Potential impact
29+
30+
Once a fix is available, a public GitHub Security Advisory will be published.

backend/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ app.use("/", mainRoutes);
6262
app.use((err, req, res, _) => {
6363
const payload = {
6464
error: {
65-
code: err.status,
65+
code: err.status || 500,
6666
message: err.public ? err.message : "Internal Error",
6767
},
6868
};

backend/biome.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/2.3.14/schema.json",
2+
"$schema": "https://biomejs.dev/schemas/2.4.15/schema.json",
33
"vcs": {
44
"enabled": true,
55
"clientKind": "git",

0 commit comments

Comments
 (0)