Skip to content

Commit 92eec95

Browse files
jc21jc21
authored
Merge pull request #1111 from jc21/develop
v2.9.3
2 parents 86eeb5f + b73a034 commit 92eec95

37 files changed

+346
-122
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

+23-9
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,30 @@ labels: bug
66
assignees: ''
77

88
---
9-
10-
**Are you in the right place?**
9+
<!--
10+
11+
Are you in the right place?
1112
- If you are looking for support on how to get your upstream server forwarding, please consider asking the community on Reddit.
1213
- If you are writing code changes to contribute and need to ask about the internals of the software, Gitter is the best place to ask.
1314
- If you think you found a bug with NPM (not Nginx, or your upstream server or MySql) then you are in the *right place.*
1415
16+
-->
17+
1518
**Checklist**
1619
- Have you pulled and found the error with `jc21/nginx-proxy-manager:latest` docker image?
20+
- Yes / No
1721
- Are you sure you're not using someone else's docker image?
18-
- If having problems with Lets Encrypt, have you made absolutely sure your site is accessible from outside of your network?
22+
- Yes / No
23+
- Have you searched for similar issues (both open and closed)?
24+
- Yes / No
1925

2026
**Describe the bug**
21-
- A clear and concise description of what the bug is.
22-
- What version of Nginx Proxy Manager is reported on the login page?
27+
<!-- A clear and concise description of what the bug is. -->
28+
29+
30+
**Nginx Proxy Manager Version**
31+
<!-- What version of Nginx Proxy Manager is reported on the login page? -->
32+
2333

2434
**To Reproduce**
2535
Steps to reproduce the behavior:
@@ -28,14 +38,18 @@ Steps to reproduce the behavior:
2838
3. Scroll down to '....'
2939
4. See error
3040

41+
3142
**Expected behavior**
32-
A clear and concise description of what you expected to happen.
43+
<!-- A clear and concise description of what you expected to happen. -->
44+
3345

3446
**Screenshots**
35-
If applicable, add screenshots to help explain your problem.
47+
<!-- If applicable, add screenshots to help explain your problem. -->
48+
3649

3750
**Operating System**
38-
- Please specify if using a Rpi, Mac, orchestration tool or any other setups that might affect the reproduction of this error.
51+
<!-- Please specify if using a Rpi, Mac, orchestration tool or any other setups that might affect the reproduction of this error. -->
52+
3953

4054
**Additional context**
41-
Add any other context about the problem here, docker version, browser version if applicable to the problem. Too much info is better than too little.
55+
<!-- Add any other context about the problem here, docker version, browser version, logs if applicable to the problem. Too much info is better than too little. -->

‎.github/ISSUE_TEMPLATE/dns_challenge_request.md

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: DNS challenge provider request
3+
about: Suggest a new provider to be available for a certificate DNS challenge
4+
title: ''
5+
labels: dns provider request
6+
assignees: ''
7+
8+
---
9+
10+
**What provider would you like to see added to NPM?**
11+
<!-- What is this provider called? -->
12+
13+
14+
**Have you checked if a certbot plugin exists?**
15+
<!--
16+
Currently NPM only supports DNS challenge providers for which a certbot plugin exists.
17+
You can visit pypi.org, and search for a package with the name `certbot-dns-<privider>`.
18+
-->

‎.github/ISSUE_TEMPLATE/feature_request.md

+13-6
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,26 @@ assignees: ''
77

88
---
99

10-
**Are you in the right place?**
10+
<!--
11+
12+
Are you in the right place?
1113
- If you are looking for support on how to get your upstream server forwarding, please consider asking the community on Reddit.
1214
- If you are writing code changes to contribute and need to ask about the internals of the software, Gitter is the best place to ask.
13-
- If you have a feature request for NPM then you are in the *right place.*
15+
- If you think you found a bug with NPM (not Nginx, or your upstream server or MySql) then you are in the *right place.*
16+
17+
-->
1418

1519
**Is your feature request related to a problem? Please describe.**
16-
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
20+
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
21+
1722

1823
**Describe the solution you'd like**
19-
A clear and concise description of what you want to happen.
24+
<!-- A clear and concise description of what you want to happen. -->
25+
2026

2127
**Describe alternatives you've considered**
22-
A clear and concise description of any alternative solutions or features you've considered.
28+
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
29+
2330

2431
**Additional context**
25-
Add any other context or screenshots about the feature request here.
32+
<!-- Add any other context or screenshots about the feature request here. -->

‎.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.9.2
1+
2.9.3

‎README.md

+79-2
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.9.2-green.svg?style=for-the-badge">
4+
<img src="https://img.shields.io/badge/version-2.9.3-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>
@@ -19,7 +19,7 @@
1919
This project comes as a pre-built docker image that enables you to easily forward to your websites
2020
running at home or otherwise, including free SSL, without having to know too much about Nginx or Letsencrypt.
2121

22-
- [Quick Setup](https://nginxproxymanager.com#quick-setup)
22+
- [Quick Setup](#quick-setup)
2323
- [Full Setup](https://nginxproxymanager.com/setup/)
2424
- [Screenshots](https://nginxproxymanager.com/screenshots/)
2525

@@ -52,6 +52,65 @@ I won't go in to too much detail here but here are the basics for someone new to
5252
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)
5353
4. Use the Nginx Proxy Manager as your gateway to forward to your other web based services
5454

55+
## Quick Setup
56+
57+
1. Install Docker and Docker-Compose
58+
59+
- [Docker Install documentation](https://docs.docker.com/install/)
60+
- [Docker-Compose Install documentation](https://docs.docker.com/compose/install/)
61+
62+
2. Create a docker-compose.yml file similar to this:
63+
64+
```yml
65+
version: '3'
66+
services:
67+
app:
68+
image: 'jc21/nginx-proxy-manager:latest'
69+
ports:
70+
- '80:80'
71+
- '81:81'
72+
- '443:443'
73+
environment:
74+
DB_MYSQL_HOST: "db"
75+
DB_MYSQL_PORT: 3306
76+
DB_MYSQL_USER: "npm"
77+
DB_MYSQL_PASSWORD: "npm"
78+
DB_MYSQL_NAME: "npm"
79+
volumes:
80+
- ./data:/data
81+
- ./letsencrypt:/etc/letsencrypt
82+
db:
83+
image: 'jc21/mariadb-aria:latest'
84+
environment:
85+
MYSQL_ROOT_PASSWORD: 'npm'
86+
MYSQL_DATABASE: 'npm'
87+
MYSQL_USER: 'npm'
88+
MYSQL_PASSWORD: 'npm'
89+
volumes:
90+
- ./data/mysql:/var/lib/mysql
91+
```
92+
93+
3. Bring up your stack
94+
95+
```bash
96+
docker-compose up -d
97+
```
98+
99+
4. Log in to the Admin UI
100+
101+
When your docker container is running, connect to it on port `81` for the admin interface.
102+
Sometimes this can take a little bit because of the entropy of keys.
103+
104+
[http://127.0.0.1:81](http://127.0.0.1:81)
105+
106+
Default Admin User:
107+
```
108+
Email: admin@example.com
109+
Password: changeme
110+
```
111+
112+
Immediately after logging in with this default user you will be asked to modify your details and change your password.
113+
55114

56115
## Contributors
57116

@@ -331,6 +390,24 @@ Special thanks to the following contributors:
331390
<br /><sub><b>Filippo Baruffaldi</b></sub>
332391
</a>
333392
</td>
393+
<td align="center">
394+
<a href="https://github.com/bikram990">
395+
<img src="https://avatars.githubusercontent.com/u/6782131?v=4" width="80" alt=""/>
396+
<br /><sub><b>Bikramjeet Singh</b></sub>
397+
</a>
398+
</td>
399+
<td align="center">
400+
<a href="https://github.com/razvanstoica89">
401+
<img src="https://avatars.githubusercontent.com/u/28236583?v=4" width="80" alt=""/>
402+
<br /><sub><b>Razvan Stoica</b></sub>
403+
</a>
404+
</td>
405+
<td align="center">
406+
<a href="https://github.com/psharma04">
407+
<img src="https://avatars.githubusercontent.com/u/22587474?v=4" width="80" alt=""/>
408+
<br /><sub><b>RBXII3</b></sub>
409+
</a>
410+
</td>
334411
</tr>
335412
</table>
336413
<!-- markdownlint-enable -->

‎docs/README.md

-72
Original file line numberDiff line numberDiff line change
@@ -37,75 +37,3 @@ footer: MIT Licensed | Copyright © 2016-present jc21.com
3737
<p>Configure other users to either view or manage their own hosts. Full access permissions are available.</p>
3838
</div>
3939
</div>
40-
41-
### Quick Setup
42-
43-
1. Install Docker and Docker-Compose
44-
45-
- [Docker Install documentation](https://docs.docker.com/install/)
46-
- [Docker-Compose Install documentation](https://docs.docker.com/compose/install/)
47-
48-
2. Create a docker-compose.yml file similar to this:
49-
50-
```yml
51-
version: '3'
52-
services:
53-
app:
54-
image: 'jc21/nginx-proxy-manager:latest'
55-
ports:
56-
- '80:80'
57-
- '81:81'
58-
- '443:443'
59-
environment:
60-
DB_MYSQL_HOST: "db"
61-
DB_MYSQL_PORT: 3306
62-
DB_MYSQL_USER: "npm"
63-
DB_MYSQL_PASSWORD: "npm"
64-
DB_MYSQL_NAME: "npm"
65-
volumes:
66-
- ./data:/data
67-
- ./letsencrypt:/etc/letsencrypt
68-
db:
69-
image: 'jc21/mariadb-aria:latest'
70-
environment:
71-
MYSQL_ROOT_PASSWORD: 'npm'
72-
MYSQL_DATABASE: 'npm'
73-
MYSQL_USER: 'npm'
74-
MYSQL_PASSWORD: 'npm'
75-
volumes:
76-
- ./data/mysql:/var/lib/mysql
77-
```
78-
79-
3. Bring up your stack
80-
81-
```bash
82-
docker-compose up -d
83-
```
84-
85-
4. Log in to the Admin UI
86-
87-
When your docker container is running, connect to it on port `81` for the admin interface.
88-
Sometimes this can take a little bit because of the entropy of keys.
89-
90-
[http://127.0.0.1:81](http://127.0.0.1:81)
91-
92-
Default Admin User:
93-
94-
```
95-
Email: admin@example.com
96-
Password: changeme
97-
```
98-
99-
Immediately after logging in with this default user you will be asked to modify your details and change your password.
100-
101-
5. Upgrading to new versions
102-
103-
```bash
104-
docker-compose pull
105-
docker-compose up -d
106-
```
107-
108-
This project will automatically update any databases or other requirements so you don't have to follow
109-
any crazy instructions. These steps above will pull the latest updates and recreate the docker
110-
containers.
111-

‎docs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@
500500
"pkg-up": "^3.1.0",
501501
"portfinder": "^1.0.28",
502502
"posix-character-classes": "^1.0.0",
503-
"postcss": "^7.0.32",
503+
"postcss": "^8.2.10",
504504
"postcss-calc": "^7.0.2",
505505
"postcss-colormin": "^4.0.3",
506506
"postcss-convert-values": "^4.0.1",

0 commit comments

Comments
 (0)