From 4a6de8deee9c5ff84e238a28f768bc54d3288d9b Mon Sep 17 00:00:00 2001 From: David Panesso Date: Fri, 10 Apr 2020 00:57:45 -0500 Subject: [PATCH 1/2] Documentation formatting on advanced configuration page --- docs/advanced-config/README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/advanced-config/README.md b/docs/advanced-config/README.md index e6792c37..a53fc6d9 100644 --- a/docs/advanced-config/README.md +++ b/docs/advanced-config/README.md @@ -22,13 +22,13 @@ NPM has the ability to include different custom configuration snippets in differ You can add your custom configuration snippet files at `/data/nginx/custom` as follow: -`/data/nginx/custom/root.conf`: Included at the very end of nginx.conf -`/data/nginx/custom/http.conf`: Included at the end of the main http block -`/data/nginx/custom/server_proxy.conf`: Included at the end of every proxy server block -`/data/nginx/custom/server_redirect.conf`: Included at the end of every redirection server block -`/data/nginx/custom/server_stream.conf`: Included at the end of every stream server block -`/data/nginx/custom/server_stream_tcp.conf`: Included at the end of every TCP stream server block -`/data/nginx/custom/server_stream_udp.conf`: Included at the end of every UDP stream server block + - `/data/nginx/custom/root.conf`: Included at the very end of nginx.conf + - `/data/nginx/custom/http.conf`: Included at the end of the main http block + - `/data/nginx/custom/server_proxy.conf`: Included at the end of every proxy server block + - `/data/nginx/custom/server_redirect.conf`: Included at the end of every redirection server block + - `/data/nginx/custom/server_stream.conf`: Included at the end of every stream server block + - `/data/nginx/custom/server_stream_tcp.conf`: Included at the end of every TCP stream server block + - `/data/nginx/custom/server_stream_udp.conf`: Included at the end of every UDP stream server block Every file is optional. From d9e1e1bbb73456926b70bd6996ae7052a8836d84 Mon Sep 17 00:00:00 2001 From: Xantios Krugor Date: Sat, 11 Apr 2020 13:03:15 +0200 Subject: [PATCH 2/2] Fixes #310 Clarification on the docs --- docs/README.md | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/docs/README.md b/docs/README.md index b1f1a8cc..0ee8154e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -45,7 +45,21 @@ footer: MIT Licensed | Copyright © 2016-present jc21.com - [Docker Install documentation](https://docs.docker.com/install/) - [Docker-Compose Install documentation](https://docs.docker.com/compose/install/) -2. Create a docker-compose.yml file similar to this: +2. Create a config file for example +```json +{ + "database": { + "engine": "mysql", + "host": "db", + "name": "npm", + "user": "npm", + "password": "npm", + "port": 3306 + } +} +``` + +3. Create a docker-compose.yml file similar to this: ```yml version: '3' @@ -71,15 +85,16 @@ services: - ./data/mysql:/var/lib/mysql ``` -3. Bring up your stack +4. Bring up your stack ```bash docker-compose up -d ``` -4. Log in to the Admin UI +5. Log in to the Admin UI When your docker container is running, connect to it on port `81` for the admin interface. +Sometimes this can take a little bit because of the entropy of keys. [http://127.0.0.1:81](http://127.0.0.1:81)