Skip to content

Commit 1bafe11

Browse files
committed
Merge branch 'NginxProxyManager:develop' into feature/openapi-schema
2 parents f569e1e + 1589613 commit 1bafe11

199 files changed

Lines changed: 13332 additions & 3659 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/dependabot.yml

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "npm"
4+
directory: "/backend"
5+
schedule:
6+
interval: "weekly"
7+
groups:
8+
dev-patch-updates:
9+
dependency-type: "development"
10+
update-types:
11+
- "patch"
12+
dev-minor-updates:
13+
dependency-type: "development"
14+
update-types:
15+
- "minor"
16+
prod-patch-updates:
17+
dependency-type: "production"
18+
update-types:
19+
- "patch"
20+
prod-minor-updates:
21+
dependency-type: "production"
22+
update-types:
23+
- "minor"
24+
25+
- package-ecosystem: "npm"
26+
directory: "/frontend"
27+
schedule:
28+
interval: "weekly"
29+
groups:
30+
dev-patch-updates:
31+
dependency-type: "development"
32+
update-types:
33+
- "patch"
34+
dev-minor-updates:
35+
dependency-type: "development"
36+
update-types:
37+
- "minor"
38+
prod-patch-updates:
39+
dependency-type: "production"
40+
update-types:
41+
- "patch"
42+
prod-minor-updates:
43+
dependency-type: "production"
44+
update-types:
45+
- "minor"
46+
47+
- package-ecosystem: "npm"
48+
directory: "/docs"
49+
schedule:
50+
interval: "weekly"
51+
groups:
52+
dev-patch-updates:
53+
dependency-type: "development"
54+
update-types:
55+
- "patch"
56+
dev-minor-updates:
57+
dependency-type: "development"
58+
update-types:
59+
- "minor"
60+
prod-patch-updates:
61+
dependency-type: "production"
62+
update-types:
63+
- "patch"
64+
prod-minor-updates:
65+
dependency-type: "production"
66+
update-types:
67+
- "minor"
68+
69+
- package-ecosystem: "npm"
70+
directory: "/test"
71+
schedule:
72+
interval: "weekly"
73+
groups:
74+
dev-patch-updates:
75+
dependency-type: "development"
76+
update-types:
77+
- "patch"
78+
dev-minor-updates:
79+
dependency-type: "development"
80+
update-types:
81+
- "minor"
82+
prod-patch-updates:
83+
dependency-type: "production"
84+
update-types:
85+
- "patch"
86+
prod-minor-updates:
87+
dependency-type: "production"
88+
update-types:
89+
- "minor"
90+
91+
- package-ecosystem: "docker"
92+
directory: "/docker"
93+
schedule:
94+
interval: "weekly"
95+
groups:
96+
updates:
97+
update-types:
98+
- "patch"
99+
- "minor"
100+
101+
- package-ecosystem: "github-actions"
102+
directory: "/"
103+
schedule:
104+
interval: "weekly"

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
stale:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/stale@v9
11+
- uses: actions/stale@v10
1212
with:
1313
stale-issue-label: 'stale'
1414
stale-pr-label: 'stale'

.version

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

README.md

Lines changed: 10 additions & 7 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.13.5-green.svg?style=for-the-badge">
4+
<img src="https://img.shields.io/badge/version-2.14.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>
@@ -36,23 +36,26 @@ so that the barrier for entry here is low.
3636
- Advanced Nginx configuration available for super users
3737
- User management, permissions and audit log
3838

39+
::: warning
40+
`armv7` is no longer supported in version 2.14+. This is due to Nodejs dropping support for armhf. Please
41+
use the `2.13.7` image tag if this applies to you.
42+
:::
3943

4044
## Hosting your home network
4145

4246
I won't go in to too much detail here but here are the basics for someone new to this self-hosted world.
4347

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

4956
## Quick Setup
5057

51-
1. Install Docker and Docker-Compose
52-
53-
- [Docker Install documentation](https://docs.docker.com/install/)
54-
- [Docker-Compose Install documentation](https://docs.docker.com/compose/install/)
55-
58+
1. [Install Docker](https://docs.docker.com/install/)
5659
2. Create a docker-compose.yml file similar to this:
5760

5861
```yml

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.2/schema.json",
2+
"$schema": "https://biomejs.dev/schemas/2.4.5/schema.json",
33
"vcs": {
44
"enabled": true,
55
"clientKind": "git",

backend/certbot/dns-plugins.json

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@
2323
"credentials": "dns_aliyun_access_key = 12345678\ndns_aliyun_access_key_secret = 1234567890abcdef1234567890abcdef",
2424
"full_plugin_name": "dns-aliyun"
2525
},
26+
"arvan": {
27+
"name": "ArvanCloud",
28+
"package_name": "certbot-dns-arvan",
29+
"version": ">=0.1.0",
30+
"dependencies": "",
31+
"credentials": "dns_arvan_key = Apikey xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
32+
"full_plugin_name": "dns-arvan"
33+
},
2634
"azure": {
2735
"name": "Azure",
2836
"package_name": "certbot-dns-azure",
@@ -74,7 +82,7 @@
7482
"cloudns": {
7583
"name": "ClouDNS",
7684
"package_name": "certbot-dns-cloudns",
77-
"version": "~=0.6.0",
85+
"version": "~=0.7.0",
7886
"dependencies": "",
7987
"credentials": "# Target user ID (see https://www.cloudns.net/api-settings/)\n\tdns_cloudns_auth_id=1234\n\t# Alternatively, one of the following two options can be set:\n\t# dns_cloudns_sub_auth_id=1234\n\t# dns_cloudns_sub_auth_user=foobar\n\n\t# API password\n\tdns_cloudns_auth_password=password1",
8088
"full_plugin_name": "dns-cloudns"
@@ -295,6 +303,14 @@
295303
"credentials": "dns_he_user = Me\ndns_he_pass = my HE password",
296304
"full_plugin_name": "dns-he"
297305
},
306+
"he-ddns": {
307+
"name": "Hurricane Electric - DDNS",
308+
"package_name": "certbot-dns-he-ddns",
309+
"version": "~=0.1.0",
310+
"dependencies": "",
311+
"credentials": "dns_he_ddns_password = verysecurepassword",
312+
"full_plugin_name": "dns-he-ddns"
313+
},
298314
"hetzner": {
299315
"name": "Hetzner",
300316
"package_name": "certbot-dns-hetzner",
@@ -375,6 +391,14 @@
375391
"credentials": "dns_joker_username = <Dynamic DNS Authentication Username>\ndns_joker_password = <Dynamic DNS Authentication Password>\ndns_joker_domain = <Dynamic DNS Domain>",
376392
"full_plugin_name": "dns-joker"
377393
},
394+
"kas": {
395+
"name": "All-Inkl",
396+
"package_name": "certbot-dns-kas",
397+
"version": "~=0.1.1",
398+
"dependencies": "kasserver",
399+
"credentials": "dns_kas_user = your_kas_user\ndns_kas_password = your_kas_password",
400+
"full_plugin_name": "dns-kas"
401+
},
378402
"leaseweb": {
379403
"name": "LeaseWeb",
380404
"package_name": "certbot-dns-leaseweb",
@@ -535,6 +559,14 @@
535559
"credentials": "[default]\naws_access_key_id=AKIAIOSFODNN7EXAMPLE\naws_secret_access_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
536560
"full_plugin_name": "dns-route53"
537561
},
562+
"simply": {
563+
"name": "Simply",
564+
"package_name": "certbot-dns-simply",
565+
"version": "~=0.1.2",
566+
"dependencies": "",
567+
"credentials": "dns_simply_account_name = UExxxxxx\ndns_simply_api_key = DsHJdsjh2812872sahj",
568+
"full_plugin_name": "dns-simply"
569+
},
538570
"spaceship": {
539571
"name": "Spaceship",
540572
"package_name": "certbot-dns-spaceship",

backend/config/sqlite-test-db.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"database": {
33
"engine": "knex-native",
44
"knex": {
5-
"client": "sqlite3",
5+
"client": "better-sqlite3",
66
"connection": {
77
"filename": "/app/config/mydb.sqlite"
88
},

0 commit comments

Comments
 (0)