Skip to content

Commit

Permalink
Merge pull request #3733 from NginxProxyManager/develop
Browse files Browse the repository at this point in the history
v2.11.2
  • Loading branch information
jc21 authored May 1, 2024
2 parents aec3020 + 79cd0c5 commit 256a667
Show file tree
Hide file tree
Showing 16 changed files with 264 additions and 141 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.11.1
2.11.2
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<p align="center">
<img src="https://nginxproxymanager.com/github.png">
<br><br>
<img src="https://img.shields.io/badge/version-2.11.1-green.svg?style=for-the-badge">
<img src="https://img.shields.io/badge/version-2.11.2-green.svg?style=for-the-badge">
<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
</a>
Expand All @@ -19,7 +19,7 @@ running at home or otherwise, including free SSL, without having to know too muc

## Project Goal

I created this project to fill a personal need to provide users with a easy way to accomplish reverse
I created this project to fill a personal need to provide users with an easy way to accomplish reverse
proxying hosts with SSL termination and it had to be so easy that a monkey could do it. This goal hasn't changed.
While there might be advanced options they are optional and the project should be as simple as possible
so that the barrier for entry here is low.
Expand Down Expand Up @@ -59,7 +59,7 @@ I won't go in to too much detail here but here are the basics for someone new to
version: '3.8'
services:
app:
image: 'jc21/nginx-proxy-manager:latest'
image: 'docker.io/jc21/nginx-proxy-manager:latest'
restart: unless-stopped
ports:
- '80:80'
Expand Down
3 changes: 1 addition & 2 deletions backend/internal/access-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ const internalAccessList = {
});
}
})
.then(internalNginx.reload)
.then(() => {
// Add to audit log
return internalAuditLog.add(access, {
Expand All @@ -227,7 +226,7 @@ const internalAccessList = {
if (row.proxy_host_count) {
return internalNginx.bulkGenerateConfigs('proxy_host', row.proxy_hosts);
}
})
}).then(internalNginx.reload)
.then(() => {
return internalAccessList.maskItems(row);
});
Expand Down
2 changes: 1 addition & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"bcrypt": "^5.0.0",
"body-parser": "^1.19.0",
"compression": "^1.7.4",
"express": "^4.17.3",
"express": "^4.19.2",
"express-fileupload": "^1.1.9",
"gravatar": "^1.8.0",
"json-schema-ref-parser": "^8.0.0",
Expand Down
2 changes: 1 addition & 1 deletion backend/schema/definitions.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
"description": "Domain Names separated by a comma",
"example": "*.jc21.com,blog.jc21.com",
"type": "array",
"maxItems": 30,
"maxItems": 100,
"uniqueItems": true,
"items": {
"type": "string",
Expand Down
2 changes: 0 additions & 2 deletions backend/templates/_location.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% include "_hsts_map.conf" %}

location {{ path }} {
proxy_set_header Host $host;
proxy_set_header X-Forwarded-Scheme $scheme;
Expand Down
Loading

0 comments on commit 256a667

Please sign in to comment.