Skip to content

Commit a572553

Browse files
authored
Merge pull request #365 from jc21/develop
Develop
2 parents 9a7a216 + 781442b commit a572553

File tree

2 files changed

+25
-10
lines changed

2 files changed

+25
-10
lines changed

docs/README.md

+18-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,21 @@ footer: MIT Licensed | Copyright © 2016-present jc21.com
4545
- [Docker Install documentation](https://docs.docker.com/install/)
4646
- [Docker-Compose Install documentation](https://docs.docker.com/compose/install/)
4747

48-
2. Create a docker-compose.yml file similar to this:
48+
2. Create a config file for example
49+
```json
50+
{
51+
"database": {
52+
"engine": "mysql",
53+
"host": "db",
54+
"name": "npm",
55+
"user": "npm",
56+
"password": "npm",
57+
"port": 3306
58+
}
59+
}
60+
```
61+
62+
3. Create a docker-compose.yml file similar to this:
4963

5064
```yml
5165
version: '3'
@@ -71,15 +85,16 @@ services:
7185
- ./data/mysql:/var/lib/mysql
7286
```
7387
74-
3. Bring up your stack
88+
4. Bring up your stack
7589
7690
```bash
7791
docker-compose up -d
7892
```
7993

80-
4. Log in to the Admin UI
94+
5. Log in to the Admin UI
8195

8296
When your docker container is running, connect to it on port `81` for the admin interface.
97+
Sometimes this can take a little bit because of the entropy of keys.
8398

8499
[http://127.0.0.1:81](http://127.0.0.1:81)
85100

docs/advanced-config/README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ NPM has the ability to include different custom configuration snippets in differ
2222
2323
You can add your custom configuration snippet files at `/data/nginx/custom` as follow:
2424

25-
`/data/nginx/custom/root.conf`: Included at the very end of nginx.conf
26-
`/data/nginx/custom/http.conf`: Included at the end of the main http block
27-
`/data/nginx/custom/server_proxy.conf`: Included at the end of every proxy server block
28-
`/data/nginx/custom/server_redirect.conf`: Included at the end of every redirection server block
29-
`/data/nginx/custom/server_stream.conf`: Included at the end of every stream server block
30-
`/data/nginx/custom/server_stream_tcp.conf`: Included at the end of every TCP stream server block
31-
`/data/nginx/custom/server_stream_udp.conf`: Included at the end of every UDP stream server block
25+
- `/data/nginx/custom/root.conf`: Included at the very end of nginx.conf
26+
- `/data/nginx/custom/http.conf`: Included at the end of the main http block
27+
- `/data/nginx/custom/server_proxy.conf`: Included at the end of every proxy server block
28+
- `/data/nginx/custom/server_redirect.conf`: Included at the end of every redirection server block
29+
- `/data/nginx/custom/server_stream.conf`: Included at the end of every stream server block
30+
- `/data/nginx/custom/server_stream_tcp.conf`: Included at the end of every TCP stream server block
31+
- `/data/nginx/custom/server_stream_udp.conf`: Included at the end of every UDP stream server block
3232

3333
Every file is optional.
3434

0 commit comments

Comments
 (0)