Merge pull request #352 from jc21/develop

Develop
Merge branch 'master' into develop
2020-04-07 12:09:17 +10:00 · 2020-04-07 12:09:09 +10:00 · 2020-04-07 12:06:55 +10:00 · 2020-04-07 12:06:36 +10:00 · 2020-04-07 12:01:48 +10:00 · 2020-04-07 11:23:03 +10:00
64 changed files with 13171 additions and 1086 deletions
--- a/.version
+++ b/.version
@ -1 +1 @@
-2.1.2
+2.2.2
--- a/62
+++ b/62
@ -42,6 +42,15 @@ pipeline {
 						}
 					}
 				}
+				stage('Versions') {
+					steps {
+						sh 'cat frontend/package.json | jq --arg BUILD_VERSION "${BUILD_VERSION}" \'.version = $BUILD_VERSION\' | sponge frontend/package.json'
+						sh 'echo -e "\\E[1;36mFrontend Version is:\\E[1;33m $(cat frontend/package.json | jq -r .version)\\E[0m"'
+						sh 'cat backend/package.json | jq --arg BUILD_VERSION "${BUILD_VERSION}" \'.version = $BUILD_VERSION\' | sponge backend/package.json'
+						sh 'echo -e "\\E[1;36mBackend Version is:\\E[1;33m  $(cat backend/package.json | jq -r .version)\\E[0m"'
+						sh 'sed -i -E "s/(version-)[0-9]+\\.[0-9]+\\.[0-9]+(-green)/\\1${BUILD_VERSION}\\2/" README.md'
+					}
+				}
 			}
 		}
 		stage('Frontend') {
@ -105,6 +114,27 @@ pipeline {
 				}
 			}
 		}
+		stage('Docs') {
+			when {
+				not {
+					equals expected: 'UNSTABLE', actual: currentBuild.result
+				}
+			}
+			steps {
+				ansiColor('xterm') {
+					dir(path: 'docs') {
+						sh 'yarn install'
+						sh 'yarn build'
+					}
+
+					dir(path: 'docs/.vuepress/dist') {
+						sh 'tar -czf ../../docs.tgz *'
+					}
+
+					archiveArtifacts(artifacts: 'docs/docs.tgz', allowEmptyArchive: false)
+				}
+			}
+		}
 		stage('MultiArch Build') {
 			when {
 				not {
@ -121,6 +151,38 @@ pipeline {
 				}
 			}
 		}
+		stage('Docs Deploy') {
+			when {
+				allOf {
+					branch 'master'
+					not {
+						equals expected: 'UNSTABLE', actual: currentBuild.result
+					}
+				}
+			}
+			steps {
+				withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'npm-s3-docs', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
+					sh """docker run --rm \\
+						--name \${COMPOSE_PROJECT_NAME}-docs-upload \\
+						-e S3_BUCKET=jc21-npm-site \\
+						-e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \\
+						-e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \\
+						-v \$(pwd):/app \\
+						-w /app \\
+						jc21/ci-tools \\
+						scripts/docs-upload /app/docs/.vuepress/dist/
+					"""
+
+					sh """docker run --rm \\
+						--name \${COMPOSE_PROJECT_NAME}-docs-invalidate \\
+						-e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \\
+						-e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \\
+						jc21/ci-tools \\
+						aws cloudfront create-invalidation --distribution-id EN1G6DEWZUTDT --paths '/*'
+					"""
+				}
+			}
+		}
 		stage('PR Comment') {
 			when {
 				allOf {
--- a/README.md
+++ b/README.md
@ -1,16 +1,24 @@
-![Nginx Proxy Manager](https://public.jc21.com/nginx-proxy-manager/github.png "Nginx Proxy Manager")
-
-# Nginx Proxy Manager
-
-![Version](https://img.shields.io/badge/version-2.1.2-green.svg?style=for-the-badge)
-![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
-![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)
-
-[![Build Status](https://ci.nginxproxymanager.jc21.com/buildStatus/icon?job=nginx-proxy-manager%2Fmaster&style=flat-square)](https://ci.nginxproxymanager.jc21.com/job/nginx-proxy-manager/job/master/)
+<p align="center">
+  <img src="https://nginxproxymanager.com/github.png">
+  <br><br>
+  <img src="https://img.shields.io/badge/version-2.2.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>
+  <a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
+    <img src="https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge">
+  </a>
+  <a href="https://ci.nginxproxymanager.com/blue/organizations/jenkins/nginx-proxy-manager/branches/">
+    <img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.nginxproxymanager.com%2Fjob%2Fnginx-proxy-manager%2Fjob%2Fmaster&style=for-the-badge">
+  </a>
+</p>

 This project comes as a pre-built docker image that enables you to easily forward to your websites
 running at home or otherwise, including free SSL, without having to know too much about Nginx or Letsencrypt.

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

 ## Project Goal

@ -32,54 +40,6 @@ so that the barrier for entry here is low.
 - User management, permissions and audit log


-## Screenshots
-
-[![Login](https://public.jc21.com/nginx-proxy-manager/v2/small/login.jpg "Login")](https://public.jc21.com/nginx-proxy-manager/v2/large/login.jpg)
-[![Dashboard](https://public.jc21.com/nginx-proxy-manager/v2/small/dashboard.jpg "Dashboard")](https://public.jc21.com/nginx-proxy-manager/v2/large/dashboard.jpg)
-[![Proxy Hosts](https://public.jc21.com/nginx-proxy-manager/v2/small/proxy-hosts.jpg "Proxy Hosts")](https://public.jc21.com/nginx-proxy-manager/v2/large/proxy-hosts.jpg)
-[![Proxy Host Settings](https://public.jc21.com/nginx-proxy-manager/v2/small/proxy-hosts-new1.jpg "Proxy Host Settings")](https://public.jc21.com/nginx-proxy-manager/v2/large/proxy-hosts-new1.jpg)
-[![Proxy Host SSL](https://public.jc21.com/nginx-proxy-manager/v2/small/proxy-hosts-new2.jpg "Proxy Host SSL")](https://public.jc21.com/nginx-proxy-manager/v2/large/proxy-hosts-new2.jpg)
-[![Redirection Hosts](https://public.jc21.com/nginx-proxy-manager/v2/small/redirection-hosts.jpg "Redirection Hosts")](https://public.jc21.com/nginx-proxy-manager/v2/large/redirection-hosts.jpg)
-[![Redirection Host Settings](https://public.jc21.com/nginx-proxy-manager/v2/small/redirection-hosts-new1.jpg "Redirection Host Settings")](https://public.jc21.com/nginx-proxy-manager/v2/large/redirection-hosts-new1.jpg)
-[![Streams](https://public.jc21.com/nginx-proxy-manager/v2/small/streams.jpg "Streams")](https://public.jc21.com/nginx-proxy-manager/v2/large/streams.jpg)
-[![Stream Settings](https://public.jc21.com/nginx-proxy-manager/v2/small/streams-new1.jpg "Stream Settings")](https://public.jc21.com/nginx-proxy-manager/v2/large/streams-new1.jpg)
-[![404 Hosts](https://public.jc21.com/nginx-proxy-manager/v2/small/dead-hosts.jpg "404 Hosts")](https://public.jc21.com/nginx-proxy-manager/v2/large/dead-hosts.jpg)
-[![404 Host Settings](https://public.jc21.com/nginx-proxy-manager/v2/small/dead-hosts-new1.jpg "404 Host Settings")](https://public.jc21.com/nginx-proxy-manager/v2/large/dead-hosts-new1.jpg)
-[![Certificates](https://public.jc21.com/nginx-proxy-manager/v2/small/certificates.jpg "Certificates")](https://public.jc21.com/nginx-proxy-manager/v2/large/certificates.jpg)
-[![Lets Encrypt Certificates](https://public.jc21.com/nginx-proxy-manager/v2/small/certificates-new1.jpg "Lets Encrypt Certificates")](https://public.jc21.com/nginx-proxy-manager/v2/large/certificates-new1.jpg)
-[![Custom Certificates](https://public.jc21.com/nginx-proxy-manager/v2/small/certificates-new2.jpg "Custom Certificates")](https://public.jc21.com/nginx-proxy-manager/v2/large/certificates-new2.jpg)
-[![Access Lists](https://public.jc21.com/nginx-proxy-manager/v2/small/access-lists.jpg "Access Lists")](https://public.jc21.com/nginx-proxy-manager/v2/large/access-lists.jpg)
-[![Access List Users](https://public.jc21.com/nginx-proxy-manager/v2/small/access-lists-new1.jpg "Access List Users")](https://public.jc21.com/nginx-proxy-manager/v2/large/access-lists-new1.jpg)
-[![Users](https://public.jc21.com/nginx-proxy-manager/v2/small/users.jpg "Users")](https://public.jc21.com/nginx-proxy-manager/v2/large/users.jpg)
-[![User Permissions](https://public.jc21.com/nginx-proxy-manager/v2/small/users-permissions.jpg "User Permissions")](https://public.jc21.com/nginx-proxy-manager/v2/large/users-permissions.jpg)
-[![Audit Log](https://public.jc21.com/nginx-proxy-manager/v2/small/audit-log.jpg "Audit Log")](https://public.jc21.com/nginx-proxy-manager/v2/large/audit-log.jpg)
-
-
-## Getting started
-
-Please consult the [installation instructions](doc/INSTALL.md) for a complete guide or
-if you just want to get up and running in the quickest time possible, grab all the files in the `doc/example/` folder and run `docker-compose up -d`
-
-
-## Administration
-
-When your docker container is running, connect to it on port `81` for the admin interface.
-
-[http://localhost:81](http://localhost:81)
-
-Note: Requesting SSL Certificates won't work until this project is accessible from the outside world, as explained below.
-
-
-### Default Administrator User
-
-```
-Email:    admin@example.com
-Password: changeme
-```
-
-Immediately after logging in with this default user you will be asked to modify your details and change your password.
-
-
 ## Hosting your home network

 I won't go in to too much detail here but here are the basics for someone new to this self-hosted world.
@ -88,14 +48,3 @@ I won't go in to too much detail here but here are the basics for someone new to
 2. Add port forwarding for port 80 and 443 to the server hosting this project
 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)
 4. Use the Nginx Proxy Manager as your gateway to forward to your other web based services
-
-
-## Nginx Proxy Manager in the wild
-
-As this software gains popularity it's common to see it integrated with other platforms. Please be aware that unless specifically mentioned in the documenation of those
-integrations, they are *not supported* by me and any donation links on the pages of those integrations will not come to me even though it looks like it.
-
-Known integrations:
-
- [HomeAssistant Hass.io plugin](https://github.com/hassio-addons/addon-nginx-proxy-manager)
- [UnRaid / Synology](https://github.com/jlesage/docker-nginx-proxy-manager)
--- a/backend/.gitignore
+++ b/backend/.gitignore
@ -4,3 +4,5 @@ yarn-error.log
 tmp
 certbot.log
 node_modules
+core.*
+
--- a/backend/internal/nginx.js
+++ b/backend/internal/nginx.js
@ -224,6 +224,9 @@ const internalNginx = {
 				locationsPromise = Promise.resolve();
 			}

+			// Set the IPv6 setting for the host
+			host.ipv6 = internalNginx.ipv6Enabled();
+
 			locationsPromise.then(() => {
 				renderEngine
 					.parseAndRender(template, host)
@ -396,6 +399,18 @@ const internalNginx = {
 	 */
 	advancedConfigHasDefaultLocation: function (config) {
 		return !!config.match(/^(?:.*;)?\s*?location\s*?\/\s*?{/im);
+	},
+
+	/**
+	 * @returns {boolean}
+	 */
+	ipv6Enabled: function () {
+		if (typeof process.env.DISABLE_IPV6 !== 'undefined') {
+			const disabled = process.env.DISABLE_IPV6.toLowerCase();
+			return !(disabled === 'on' || disabled === 'true' || disabled === '1' || disabled === 'yes');
+		}
+
+		return true;
 	}
 };

--- a/backend/package.json
+++ b/backend/package.json
@ -1,28 +1,28 @@
 {
 	"name": "nginx-proxy-manager",
-	"version": "2.1.2",
+	"version": "0.0.0",
 	"description": "A beautiful interface for creating Nginx endpoints",
 	"main": "js/index.js",
 	"dependencies": {
-		"ajv": "^6.11.0",
+		"ajv": "^6.12.0",
 		"batchflow": "^0.4.0",
-		"bcrypt": "^3.0.8",
+		"bcrypt": "^4.0.1",
 		"body-parser": "^1.19.0",
 		"compression": "^1.7.4",
-		"config": "^3.2.5",
+		"config": "^3.3.1",
 		"diskdb": "^0.1.17",
 		"express": "^4.17.1",
 		"express-fileupload": "^1.1.6",
 		"gravatar": "^1.8.0",
 		"html-entities": "^1.2.1",
-		"json-schema-ref-parser": "^7.1.3",
+		"json-schema-ref-parser": "^8.0.0",
 		"jsonwebtoken": "^8.5.1",
-		"knex": "^0.20.10",
-		"liquidjs": "^9.7.1",
+		"knex": "^0.20.13",
+		"liquidjs": "^9.11.10",
 		"lodash": "^4.17.15",
 		"moment": "^2.24.0",
 		"mysql": "^2.18.1",
-		"node-rsa": "^1.0.7",
+		"node-rsa": "^1.0.8",
 		"nodemon": "^2.0.2",
 		"objection": "^2.1.3",
 		"path": "^0.12.7",
@ -40,6 +40,6 @@
 	"devDependencies": {
 		"eslint": "^6.8.0",
 		"eslint-plugin-align-assignments": "^1.1.2",
-		"prettier": "^1.19.1"
+		"prettier": "^2.0.4"
 	}
 }
--- a/backend/templates/_listen.conf
+++ b/backend/templates/_listen.conf
@ -1,5 +1,15 @@
  listen 80;
+{% if ipv6 -%}
+  listen [::]:80;
+{% else -%}
+  #listen [::]:80;
+{% endif %}
 {% if certificate -%}
  listen 443 ssl{% if http2_support %} http2{% endif %};
+{% if ipv6 -%}
+  listen [::]:443;
+{% else -%}
+  #listen [::]:443;
+{% endif %}
 {% endif %}
  server_name {{ domain_names | join: " " }};
--- a/backend/templates/proxy_host.conf
+++ b/backend/templates/proxy_host.conf
@ -32,7 +32,7 @@ server {

    {% if allow_websocket_upgrade == 1 or allow_websocket_upgrade == true %}
    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
+    proxy_set_header Connection $http_connection;
    proxy_http_version 1.1;
    {% endif %}

--- a/backend/templates/stream.conf
+++ b/backend/templates/stream.conf
@ -6,6 +6,12 @@
 {% if tcp_forwarding == 1 or tcp_forwarding == true -%}
 server {
  listen {{ incoming_port }};
+{% if ipv6 -%}
+  listen [::]:{{ incoming_port }};
+{% else -%}
+  #listen [::]:{{ incoming_port }};
+{% endif %}
+
  proxy_pass {{ forward_ip }}:{{ forwarding_port }};

  # Custom
@ -16,6 +22,11 @@ server {
 {% if udp_forwarding == 1 or udp_forwarding == true %}
 server {
  listen {{ incoming_port }} udp;
+{% if ipv6 -%}
+  listen [::]:{{ incoming_port }} udp;
+{% else -%}
+  #listen [::]:{{ incoming_port }} udp;
+{% endif %}
  proxy_pass {{ forward_ip }}:{{ forwarding_port }};

  # Custom
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@ -2,6 +2,15 @@
 # yarn lockfile v1


+"@apidevtools/json-schema-ref-parser@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-8.0.0.tgz#9eb749499b3f8d919e90bb141e4b6f67aee4692d"
+  integrity sha512-n4YBtwQhdpLto1BaUCyAeflizmIbaloGShsPyRtFf5qdFJxfssj+GgLavczgKJFa3Bq+3St2CKcpRJdjtB4EBw==
+  dependencies:
+    "@jsdevtools/ono" "^7.1.0"
+    call-me-maybe "^1.0.1"
+    js-yaml "^3.13.1"
+
 "@babel/code-frame@^7.0.0":
  version "7.8.3"
  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
@ -9,15 +18,30 @@
  dependencies:
    "@babel/highlight" "^7.8.3"

+"@babel/helper-validator-identifier@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed"
+  integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==
+
 "@babel/highlight@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
-  integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
+  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
  dependencies:
+    "@babel/helper-validator-identifier" "^7.9.0"
    chalk "^2.0.0"
-    esutils "^2.0.2"
    js-tokens "^4.0.0"

+"@jsdevtools/ono@^7.1.0":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.1.tgz#36034f9cb0fb456858c137a3f3e6d6db67ab5cc5"
+  integrity sha512-pu5fxkbLQWzRbBgfFbZfHXz0KlYojOfVdUhcNfy9lef8ZhBt0pckGr8g7zv4vPX4Out5vBNvqd/az4UaVWzZ9A==
+
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
 abbrev@1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@ -31,20 +55,20 @@ accepts@~1.3.5, accepts@~1.3.7:
    mime-types "~2.1.24"
    negotiator "0.6.2"

-acorn-jsx@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
-  integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
+acorn-jsx@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
+  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==

-acorn@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
-  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
+acorn@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
+  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==

-ajv@^6.10.0, ajv@^6.10.2, ajv@^6.11.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"
-  integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==
+ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0:
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
+  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
  dependencies:
    fast-deep-equal "^3.1.1"
    fast-json-stable-stringify "^2.0.0"
@ -59,11 +83,11 @@ ansi-align@^2.0.0:
    string-width "^2.0.0"

 ansi-escapes@^4.2.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d"
-  integrity sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
  dependencies:
-    type-fest "^0.8.1"
+    type-fest "^0.11.0"

 ansi-regex@^2.0.0:
  version "2.1.1"
@ -92,6 +116,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
  dependencies:
    color-convert "^1.9.0"

+ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
 ansi-styles@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
@ -205,12 +237,12 @@ batchflow@^0.4.0:
  resolved "https://registry.yarnpkg.com/batchflow/-/batchflow-0.4.0.tgz#7d419df79b6b7587b06f9ea34f96ccef6f74e5b5"
  integrity sha1-fUGd95trdYewb56jT5bM72905bU=

-bcrypt@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-3.0.8.tgz#fe437b7569faffc1105c3c3f6e7d2913e3d3bea5"
-  integrity sha512-jKV6RvLhI36TQnPDvUFqBEnGX9c8dRRygKxCZu7E+MgLfKZbmmXL8a7/SFFOyHoPNX9nV81cKRC5tbQfvEQtpw==
+bcrypt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-4.0.1.tgz#06e21e749a061020e4ff1283c1faa93187ac57fe"
+  integrity sha512-hSIZHkUxIDS5zA2o00Kf2O5RfVbQ888n54xQoF/eIaquU4uaLxK8vhhBdktd0B3n2MjkcAWzv4mnhogykBKOUQ==
  dependencies:
-    nan "2.14.0"
+    node-addon-api "^2.0.0"
    node-pre-gyp "0.14.0"

 bignumber.js@9.0.0:
@ -223,15 +255,10 @@ binary-extensions@^2.0.0:
  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==

-bluebird@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
 blueimp-md5@^2.3.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.12.0.tgz#be7367938a889dec3ffbb71138617c117e9c130a"
-  integrity sha512-zo+HIdIhzojv6F1siQPqPFROyVy7C50KzHv/k/Iz+BtvtVzSHXiMXOpq2wCfNkeBqdCv+V8XOV96tsEt2W/3rQ==
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.13.0.tgz#07314b0c64dda0bf1733f96ce40d5af94eb28965"
+  integrity sha512-lmp0m647R5e77ORduxLW5mISIDcvgJZa52vMBv5uVI3UmSWTQjkJsZVBfaFqQPw/QFogJwvY6e3Gl9nP+Loe+Q==

 body-parser@1.19.0, body-parser@^1.19.0:
  version "1.19.0"
@ -359,7 +386,7 @@ chalk@^0.4.0:
    has-color "~0.1.0"
    strip-ansi "~0.1.0"

-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2:
  version "2.4.2"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@ -368,6 +395,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2, chalk@^2.4.2:
    escape-string-regexp "^1.0.5"
    supports-color "^5.3.0"

+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chardet@^0.7.0:
  version "0.7.0"
  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@ -454,11 +489,23 @@ color-convert@^1.9.0:
  dependencies:
    color-name "1.1.3"

+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3:
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=

+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 colorette@1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.1.0.tgz#1f943e5a357fac10b4e0f5aaef3b14cdc1af6ec7"
@ -499,12 +546,12 @@ concat-map@0.0.1:
  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=

-config@^3.2.5:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/config/-/config-3.2.5.tgz#ab10ab88b61a873fbf9a5f0c6b4a22750422f243"
-  integrity sha512-8itpjyR01lAJanhAlPncBngYRZez/LoRLW8wnGi+6SEcsUyA1wvHvbpIrAJYDJT+W9BScnj4mYoUgbtp9I+0+Q==
+config@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/config/-/config-3.3.1.tgz#b6a70e2908a43b98ed20be7e367edf0cc8ed5a19"
+  integrity sha512-+2/KaaaAzdwUBE3jgZON11L1ggLLhpf2FsGrfqYFHZW22ySGv/HqYIXrBwKKvn+XZh1UBUjHwAcrfsSkSygT+Q==
  dependencies:
-    json5 "^1.0.1"
+    json5 "^2.1.1"

 configstore@^3.0.0:
  version "3.1.2"
@ -845,12 +892,12 @@ esm@^3.2.25:
  integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==

 espree@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d"
-  integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
+  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
  dependencies:
-    acorn "^7.1.0"
-    acorn-jsx "^5.1.0"
+    acorn "^7.1.1"
+    acorn-jsx "^5.2.0"
    eslint-visitor-keys "^1.1.0"

 esprima@^4.0.0:
@ -859,11 +906,11 @@ esprima@^4.0.0:
  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==

 esquery@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48"
-  integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.2.0.tgz#a010a519c0288f2530b3404124bfb5f02e9797fe"
+  integrity sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q==
  dependencies:
-    estraverse "^4.0.0"
+    estraverse "^5.0.0"

 esrecurse@^4.1.0:
  version "4.2.1"
@ -872,11 +919,16 @@ esrecurse@^4.1.0:
  dependencies:
    estraverse "^4.1.0"

-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
+estraverse@^4.1.0, estraverse@^4.1.1:
  version "4.3.0"
  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==

+estraverse@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.0.0.tgz#ac81750b482c11cca26e4b07e83ed8f75fbcdc22"
+  integrity sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A==
+
 esutils@^2.0.2:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@ -1128,9 +1180,9 @@ flat-cache@^2.0.1:
    write "1.0.3"

 flatted@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
-  integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==

 for-in@^1.0.1, for-in@^1.0.2:
  version "1.0.2"
@ -1225,9 +1277,9 @@ getopts@2.2.5:
  integrity sha512-9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA==

 glob-parent@^5.0.0, glob-parent@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
-  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
  dependencies:
    is-glob "^4.0.1"

@ -1271,9 +1323,9 @@ global-prefix@^1.0.1:
    which "^1.2.14"

 globals@^12.1.0:
-  version "12.3.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13"
-  integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
+  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
  dependencies:
    type-fest "^0.8.1"

@ -1319,6 +1371,11 @@ has-flag@^3.0.0:
  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=

+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 has-unicode@^2.0.0:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@ -1460,22 +1517,22 @@ ini@^1.3.4, ini@~1.3.0:
  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==

 inquirer@^7.0.0:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz#99af5bde47153abca23f5c7fc30db247f39da703"
-  integrity sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
+  integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
  dependencies:
    ansi-escapes "^4.2.1"
-    chalk "^2.4.2"
+    chalk "^3.0.0"
    cli-cursor "^3.1.0"
    cli-width "^2.0.0"
    external-editor "^3.0.3"
    figures "^3.0.0"
    lodash "^4.17.15"
    mute-stream "0.0.8"
-    run-async "^2.2.0"
+    run-async "^2.4.0"
    rxjs "^6.5.3"
    string-width "^4.1.0"
-    strip-ansi "^5.1.0"
+    strip-ansi "^6.0.0"
    through "^2.3.6"

 interpret@^2.0.0:
@ -1488,10 +1545,10 @@ invert-kv@^2.0.0:
  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==

-ipaddr.js@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
-  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
+ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==

 is-absolute@^1.0.0:
  version "1.0.0"
@ -1740,14 +1797,12 @@ json-parse-better-errors@^1.0.1:
  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==

-json-schema-ref-parser@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-7.1.3.tgz#21468cd180b2f1939ce93fe291f743b441e97d49"
-  integrity sha512-/Lmyl0PW27dOmCO03PI339+1gs4Z2PlqIyUgzIOtoRp08zkkMCB30TRbdppbPO7WWzZX0uT98HqkDiZSujkmbA==
+json-schema-ref-parser@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-8.0.0.tgz#7c758fac2cf822c05e837abd0a13f8fa2c15ffd4"
+  integrity sha512-2P4icmNkZLrBr6oa5gSZaDSol/oaBHYkoP/8dsw63E54NnHGRhhiFuy9yFoxPuSm+uHKmeGxAAWMDF16SCHhcQ==
  dependencies:
-    call-me-maybe "^1.0.1"
-    js-yaml "^3.13.1"
-    ono "^6.0.0"
+    "@apidevtools/json-schema-ref-parser" "8.0.0"

 json-schema-traverse@^0.4.1:
  version "0.4.1"
@ -1759,12 +1814,12 @@ json-stable-stringify-without-jsonify@^1.0.1:
  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=

-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+json5@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
  dependencies:
-    minimist "^1.2.0"
+    minimist "^1.2.5"

 jsonwebtoken@^8.5.1:
  version "8.5.1"
@ -1823,12 +1878,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==

-knex@^0.20.10:
-  version "0.20.10"
-  resolved "https://registry.yarnpkg.com/knex/-/knex-0.20.10.tgz#48c22abe38fdc6856b5e9d948685ca009b3fbd77"
-  integrity sha512-07D6fvY5NdvrfRPmkLLG+OrHvmAy55OX7eXkN8TMiOOI5lWJh1dC2zKjeEQJqUILMOsTnZCGqTKGaRm4t1E9xg==
+knex@^0.20.13:
+  version "0.20.13"
+  resolved "https://registry.yarnpkg.com/knex/-/knex-0.20.13.tgz#056c310d963f7efce1b3c7397576add1323f1146"
+  integrity sha512-YVl//Te0G5suc+d9KyeI6WuhtgVlxu6HXYQB+WqrccFkSZAbHqlqZlUMogYG3UoVq69c3kiFbbxgUNkrO0PVfg==
  dependencies:
-    bluebird "^3.7.2"
    colorette "1.1.0"
    commander "^4.1.1"
    debug "4.1.1"
@ -1842,7 +1896,7 @@ knex@^0.20.10:
    pg-connection-string "2.1.0"
    tarn "^2.0.0"
    tildify "2.0.0"
-    uuid "^3.4.0"
+    uuid "^7.0.1"
    v8flags "^3.1.3"

 latest-version@^3.0.0:
@ -1881,10 +1935,10 @@ liftoff@3.1.0:
    rechoir "^0.6.2"
    resolve "^1.1.7"

-liquidjs@^9.7.1:
-  version "9.7.1"
-  resolved "https://registry.yarnpkg.com/liquidjs/-/liquidjs-9.7.1.tgz#31aa7f7d563b4596fc5a03300f667af0d098d660"
-  integrity sha512-CdZFSL5Md0VObIGjJdswjQ1volHG1/GpbvAr4pDUjA9u2a6HKQVOYzWugiBe6iZ5v8Gfm2h77KN0ckso3bLCiQ==
+liquidjs@^9.11.10:
+  version "9.11.10"
+  resolved "https://registry.yarnpkg.com/liquidjs/-/liquidjs-9.11.10.tgz#3bf69771db12d047910ec87b2f78acedc448a1b4"
+  integrity sha512-ujDOoesvbfz6UiCvx5+TpEYTAeT4KV6jF2I/67lUnR8Uj3m3djpEpGxOzcmLlz2v/VvOejYm8snc5xo9FMOZ9w==

 load-json-file@^4.0.0:
  version "4.0.0"
@ -2074,15 +2128,10 @@ minimatch@^3.0.4:
  dependencies:
    brace-expansion "^1.1.7"

-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==

 minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
  version "2.9.0"
@ -2108,11 +2157,11 @@ mixin-deep@^1.2.0:
    is-extendable "^1.0.1"

 mkdirp@^0.5.0, mkdirp@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
  dependencies:
-    minimist "0.0.8"
+    minimist "^1.2.5"

 moment@^2.24.0:
  version "2.24.0"
@ -2149,11 +2198,6 @@ mysql@^2.18.1:
    safe-buffer "5.1.2"
    sqlstring "2.3.1"

-nan@2.14.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
-
 nanomatch@^1.2.9:
  version "1.2.13"
  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@ -2177,9 +2221,9 @@ natural-compare@^1.4.0:
  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=

 needle@^2.2.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528"
-  integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a"
+  integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==
  dependencies:
    debug "^3.2.6"
    iconv-lite "^0.4.4"
@ -2195,6 +2239,11 @@ nice-try@^1.0.4:
  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==

+node-addon-api@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.0.tgz#f9afb8d777a91525244b01775ea0ddbe1125483b"
+  integrity sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==
+
 node-pre-gyp@0.14.0:
  version "0.14.0"
  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
@ -2211,10 +2260,10 @@ node-pre-gyp@0.14.0:
    semver "^5.3.0"
    tar "^4.4.2"

-node-rsa@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/node-rsa/-/node-rsa-1.0.7.tgz#85b7a6d6fa8ee624be6402a6b41be49272d58055"
-  integrity sha512-idwRXma6scFufZmbaKkHpJoLL93yynRefP6yur13wZ5i9FR35ex451KCoF2OORDeJanyRVahmjjiwmUlCnTqJA==
+node-rsa@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/node-rsa/-/node-rsa-1.0.8.tgz#29a4517380f3272cd2073ff4d4c1ca44127ea4ad"
+  integrity sha512-q8knkMHEqViIX/fshOltCHTtlt4Nw5wpBpu0//LB1tkxqYZB/001dYMwbPvTPiENwKvPqVDkhxK6J4fV09oa7w==
  dependencies:
    asn1 "^0.2.4"

@ -2240,9 +2289,9 @@ nodemon@^2.0.2:
    update-notifier "^2.5.0"

 nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
+  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
  dependencies:
    abbrev "1"
    osenv "^0.1.4"
@ -2382,11 +2431,6 @@ onetime@^5.1.0:
  dependencies:
    mimic-fn "^2.1.0"

-ono@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ono/-/ono-6.0.1.tgz#1bc14ffb8af1e5db3f7397f75b88e4a2d64bbd71"
-  integrity sha512-5rdYW/106kHqLeG22GE2MHKq+FlsxMERZev9DCzQX1zwkxnFwBivSn5i17a5O/rDmOJOdf4Wyt80UZljzx9+DA==
-
 optionator@^0.8.3:
  version "0.8.3"
  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@ -2565,9 +2609,9 @@ pg-connection-string@2.1.0:
  integrity sha512-bhlV7Eq09JrRIvo1eKngpwuqKtJnNhZdpdOlvrPrA4dxqXPjxSrbNrfnIDmTpwMyRszrcV4kU5ZA4mMsQUrjdg==

 picomatch@^2.0.4, picomatch@^2.0.7:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
-  integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==

 pify@^3.0.0:
  version "3.0.0"
@ -2597,10 +2641,10 @@ prepend-http@^1.0.1:
  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=

-prettier@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
-  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
+prettier@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.4.tgz#2d1bae173e355996ee355ec9830a7a1ee05457ef"
+  integrity sha512-SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w==

 process-nextick-args@~2.0.0:
  version "2.0.1"
@ -2618,12 +2662,12 @@ progress@^2.0.0:
  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==

 proxy-addr@~2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
-  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
+  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
  dependencies:
    forwarded "~0.1.2"
-    ipaddr.js "1.9.0"
+    ipaddr.js "1.9.1"

 pseudomap@^1.0.2:
  version "1.0.2"
@ -2825,17 +2869,17 @@ rimraf@^2.6.1:
  dependencies:
    glob "^7.1.3"

-run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
+run-async@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8"
+  integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==
  dependencies:
    is-promise "^2.1.0"

 rxjs@^6.5.3:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
-  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
+  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
  dependencies:
    tslib "^1.9.0"

@ -2950,9 +2994,9 @@ shebang-regex@^1.0.0:
  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=

 signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==

 signale@^1.4.0:
  version "1.4.0"
@ -3144,9 +3188,9 @@ strip-eof@^1.0.0:
  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=

 strip-json-comments@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
-  integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180"
+  integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==

 strip-json-comments@~2.0.1:
  version "2.0.1"
@ -3160,6 +3204,13 @@ supports-color@^5.3.0, supports-color@^5.5.0:
  dependencies:
    has-flag "^3.0.0"

+supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  dependencies:
+    has-flag "^4.0.0"
+
 table@^5.2.3:
  version "5.4.6"
  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
@ -3283,9 +3334,9 @@ touch@^3.1.0:
    nopt "~1.0.10"

 tslib@^1.9.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
-  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
+  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==

 type-check@~0.3.2:
  version "0.3.2"
@ -3294,6 +3345,11 @@ type-check@~0.3.2:
  dependencies:
    prelude-ls "~1.1.2"

+type-fest@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
 type-fest@^0.8.1:
  version "0.8.1"
  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
@ -3416,11 +3472,16 @@ utils-merge@1.0.1:
  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=

-uuid@^3.3.2, uuid@^3.4.0:
+uuid@^3.3.2:
  version "3.4.0"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==

+uuid@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
+  integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
+
 v8-compile-cache@^2.0.3:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
@ -3512,9 +3573,9 @@ xml2js@0.4.0:
    xmlbuilder ">=0.4.2"

 xmlbuilder@>=0.4.2:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-14.0.0.tgz#876b5aec4f05ffd5feb97b0a871c855d16fbeb8c"
-  integrity sha512-ts+B2rSe4fIckR6iquDjsKbQFK2NlUk6iG5nf14mDEyldgoc2nEKZ3jZWMPTxGQwVgToSjt6VGIho1H8/fNFTg==
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.0.tgz#4c4c9109180937baeb839978b590250be09a4aef"
+  integrity sha512-xae5hmPQnmSFhpiuV3NGXq+FWGOvWy/rIzxVLnRtSSABbPZWltTQCe6WlHDpCq5pGvnGwNsWnS1FdkW7Tx9FNQ==

 y18n@^3.2.1:
  version "3.2.1"
--- a/doc/example/config.json
+++ b/doc/example/config.json
@ -1,10 +0,0 @@
-{
-  "database": {
-    "engine": "mysql",
-    "host": "db",
-    "name": "npm",
-    "user": "npm",
-    "password": "npm",
-    "port": 3306
-  }
-}
--- a/doc/example/docker-compose.yml
+++ b/doc/example/docker-compose.yml
@ -1,28 +0,0 @@
-version: "3"
-services:
-  app:
-    image: jc21/nginx-proxy-manager:latest
-    restart: always
-    ports:
-      - 80:80
-      - 81:81
-      - 443:443
-    volumes:
-      - ./config.json:/app/config/production.json
-      - ./data:/data
-      - ./letsencrypt:/etc/letsencrypt
-    depends_on:
-      - db
-    environment:
-    # if you want pretty colors in your docker logs:
-    - FORCE_COLOR=1
-  db:
-    image: jc21/mariadb-aria:latest
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: "npm"
-      MYSQL_DATABASE: "npm"
-      MYSQL_USER: "npm"
-      MYSQL_PASSWORD: "npm"
-    volumes:
-      - ./data/mysql:/var/lib/mysql
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@ -15,6 +15,7 @@ services:
      - NODE_ENV=development
      - FORCE_COLOR=1
      - DEVELOPMENT=true
+      #- DISABLE_IPV6=true
    volumes:
      - npm_data:/data
      - le_data:/etc/letsencrypt
--- a/docker/rootfs/bin/handle-ipv6-setting
+++ b/docker/rootfs/bin/handle-ipv6-setting
@ -0,0 +1,46 @@
+#!/bin/bash
+
+# This command reads the `DISABLE_IPV6` env var and will either enable
+# or disable ipv6 in all nginx configs based on this setting.
+
+# Lowercase
+DISABLE_IPV6=$(echo "${DISABLE_IPV6:-}" | tr '[:upper:]' '[:lower:]')
+
+CYAN='\E[1;36m'
+BLUE='\E[1;34m'
+YELLOW='\E[1;33m'
+RED='\E[1;31m'
+RESET='\E[0m'
+
+FOLDER=$1
+if [ "$FOLDER" == "" ]; then
+	echo -e "${RED}❯ $0 requires a absolute folder path as the first argument!${RESET}"
+	echo -e "${YELLOW}  ie: $0 /data/nginx${RESET}"
+	exit 1
+fi
+
+FILES=$(find "$FOLDER" -type f -name "*.conf")
+if [ "$DISABLE_IPV6" == "true" ] || [ "$DISABLE_IPV6" == "on" ] || [ "$DISABLE_IPV6" == "1" ] || [ "$DISABLE_IPV6" == "yes" ]; then
+	# IPV6 is disabled
+	echo "Disabling IPV6 in hosts"
+	echo -e "${BLUE}❯ ${CYAN}Disabling IPV6 in hosts: ${YELLOW}${FOLDER}${RESET}"
+
+	# Iterate over configs and run the regex
+	for FILE in $FILES
+	do
+		echo -e "  ${BLUE}❯ ${YELLOW}${FILE}${RESET}"
+		sed -E -i 's/^([^#]*)listen \[::\]/\1#listen [::]/g' "$FILE"
+	done
+
+else
+	# IPV6 is enabled
+	echo -e "${BLUE}❯ ${CYAN}Enabling IPV6 in hosts: ${YELLOW}${FOLDER}${RESET}"
+
+	# Iterate over configs and run the regex
+	for FILE in $FILES
+	do
+		echo -e "  ${BLUE}❯ ${YELLOW}${FILE}${RESET}"
+		sed -E -i 's/^(\s*)#listen \[::\]/\1listen [::]/g' "$FILE"
+	done
+
+fi
--- a/docker/rootfs/etc/services.d/nginx/run
+++ b/docker/rootfs/etc/services.d/nginx/run
@ -42,4 +42,8 @@ then
 	echo "Complete"
 fi

+# Handle IPV6 settings
+/bin/handle-ipv6-setting /etc/nginx/conf.d
+/bin/handle-ipv6-setting /data/nginx
+
 exec nginx
--- a/docs/.gitignore
+++ b/docs/.gitignore
@ -0,0 +1,3 @@
+.vuepress/dist
+node_modules
+ts
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@ -0,0 +1,80 @@
+module.exports = {
+	locales: {
+		"/": {
+			lang: "en-US",
+			title: "Nginx Proxy Manager",
+			description: "Expose your services easily and securely"
+		}
+	},
+	head: [
+		["link", { rel: "icon", href: "/icon.png" }],
+		["meta", { name: "description", content: "Docker container and built in Web Application for managing Nginx proxy hosts with a simple, powerful interface, providing free SSL support via Let's Encrypt" }],
+		["meta", { property: "og:title", content: "Nginx Proxy Manager" }],
+		["meta", { property: "og:description", content: "Docker container and built in Web Application for managing Nginx proxy hosts with a simple, powerful interface, providing free SSL support via Let's Encrypt"}],
+		["meta", { property: "og:type", content: "website" }],
+		["meta", { property: "og:url", content: "https://nginxproxymanager.com/" }],
+		["meta", { property: "og:image", content: "https://nginxproxymanager.com/icon.png" }],
+		["meta", { name: "twitter:card", content: "summary"}],
+		["meta", { name: "twitter:title", content: "Nginx Proxy Manager"}],
+		["meta", { name: "twitter:description", content: "Docker container and built in Web Application for managing Nginx proxy hosts with a simple, powerful interface, providing free SSL support via Let's Encrypt"}],
+		["meta", { name: "twitter:image", content: "https://nginxproxymanager.com/icon.png"}],
+		["meta", { name: "twitter:alt", content: "Nginx Proxy Manager"}],
+	],
+	themeConfig: {
+		logo: "/icon.png",
+		// the GitHub repo path
+		repo: "jc21/nginx-proxy-manager",
+		// the label linking to the repo
+		repoLabel: "GitHub",
+		// if your docs are not at the root of the repo:
+		docsDir: "docs",
+		// defaults to false, set to true to enable
+		editLinks: true,
+		locales: {
+			"/": {
+				// text for the language dropdown
+				selectText: "Languages",
+				// label for this locale in the language dropdown
+				label: "English",
+				// Custom text for edit link. Defaults to "Edit this page"
+				editLinkText: "Edit this page on GitHub",
+				// Custom navbar values
+				nav: [{ text: "Setup", link: "/setup/" }],
+				// Custom sidebar values
+				sidebar: [
+					"/",
+					["/guide/", "Guide"],
+					["/screenshots/", "Screenshots"],
+					["/setup/", "Setup Instructions"],
+					["/advanced-config/", "Advanced Configuration"],
+					["/third-party/", "Third Party"]
+				]
+			}
+		}
+	},
+	plugins: [
+		[
+			"@vuepress/google-analytics",
+			{
+				ga: "UA-99675467-4"
+			}
+		],
+		[
+			"sitemap",
+			{
+				hostname: "https://nginxproxymanager.com"
+			}
+		],
+		[
+			'vuepress-plugin-zooming',
+			{
+				selector: '.zooming',
+				delay: 1000,
+				options: {
+					bgColor: 'black',
+					zIndex: 10000,
+				},
+			},
+		],
+	]
+};
--- a/docs/.vuepress/public/github.png
+++ b/docs/.vuepress/public/github.png
--- a/docs/.vuepress/public/icon.png
+++ b/docs/.vuepress/public/icon.png
--- a/docs/.vuepress/public/logo.png
+++ b/docs/.vuepress/public/logo.png
--- a/docs/.vuepress/public/logo.svg
+++ b/docs/.vuepress/public/logo.svg
--- a/docs/.vuepress/public/nerd-font.woff2
+++ b/docs/.vuepress/public/nerd-font.woff2
--- a/docs/.vuepress/public/robots.txt
+++ b/docs/.vuepress/public/robots.txt
@ -0,0 +1,2 @@
+User-agent: *
+Disallow:
--- a/docs/.vuepress/public/screenshots/access-lists.png
+++ b/docs/.vuepress/public/screenshots/access-lists.png
--- a/docs/.vuepress/public/screenshots/audit-log.png
+++ b/docs/.vuepress/public/screenshots/audit-log.png
--- a/docs/.vuepress/public/screenshots/certificates.png
+++ b/docs/.vuepress/public/screenshots/certificates.png
--- a/docs/.vuepress/public/screenshots/custom-settings.png
+++ b/docs/.vuepress/public/screenshots/custom-settings.png
--- a/docs/.vuepress/public/screenshots/dashboard.png
+++ b/docs/.vuepress/public/screenshots/dashboard.png
--- a/docs/.vuepress/public/screenshots/dead-hosts.png
+++ b/docs/.vuepress/public/screenshots/dead-hosts.png
--- a/docs/.vuepress/public/screenshots/login.png
+++ b/docs/.vuepress/public/screenshots/login.png
--- a/docs/.vuepress/public/screenshots/permissions.png
+++ b/docs/.vuepress/public/screenshots/permissions.png
--- a/docs/.vuepress/public/screenshots/proxy-hosts-add.png
+++ b/docs/.vuepress/public/screenshots/proxy-hosts-add.png
--- a/docs/.vuepress/public/screenshots/proxy-hosts.png
+++ b/docs/.vuepress/public/screenshots/proxy-hosts.png
--- a/docs/.vuepress/public/screenshots/redirection-hosts.png
+++ b/docs/.vuepress/public/screenshots/redirection-hosts.png
--- a/docs/.vuepress/styles/index.styl
+++ b/docs/.vuepress/styles/index.styl
@ -0,0 +1,23 @@
+.home .hero img
+  max-width: 500px !important
+  min-width: 300px
+  width: 100%
+
+.center
+  margin 0 auto;
+  width: 80%
+
+#main-title
+  display: none
+
+.hero
+  margin: 150px 25px 70px
+
+@font-face
+  font-family: 'Nerd Font';
+  src: url("/nerd-font.woff2") format("woff2");
+  font-weight: 400;
+  font-style: normal
+
+code
+  font-family: 'Nerd Font', source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
--- a/docs/.vuepress/styles/palette.styl
+++ b/docs/.vuepress/styles/palette.styl
@ -0,0 +1,4 @@
+$accentColor = #f15833
+$textColor = #663015
+$borderColor = #eaecef
+$codeBgColor = #282c34
--- a/docs/README.md
+++ b/docs/README.md
@ -0,0 +1,93 @@
+---
+home: true
+heroImage: /logo.png
+actionText: Get Started →
+actionLink: /guide/
+footer: MIT Licensed | Copyright © 2016-present jc21.com
+---
+
+<div class="features">
+  <div class="feature">
+    <h2>Get Connected</h2>
+    <p>
+      Expose web services on your network &middot;
+      Free SSL with Let's Encrypt  &middot;
+      Designed with security in mind  &middot;
+      Perfect for home networks
+    </p>
+  </div>
+  <div class="feature">
+    <h2>Proxy Hosts</h2>
+    <p>Expose your private network Web services and get connected anywhere.</p>
+  </div>
+  <div class="feature">
+    <h2>Beautiful UI</h2>
+    <p>Based on Tabler, the interface is a pleasure to use. Configuring a server has never been so fun.</p>
+  </div>
+  <div class="feature">
+    <h2>Free SSL</h2>
+    <p>Built in Let’s Encrypt support allows you to secure your Web services at no cost to you. The certificates even renew themselves!</p>
+  </div>
+  <div class="feature">
+    <h2>Docker FTW</h2>
+    <p>Built as a Docker Image, Nginx Proxy Manager only requires a database.</p>
+  </div>
+  <div class="feature">
+    <h2>Multiple Users</h2>
+    <p>Configure other users to either view or manage their own hosts. Full access permissions are available.</p>
+  </div>
+</div>
+
+### Quick Setup
+
+1. Install Docker and Docker-Compose
+
+- [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:
+
+```yml
+version: '3'
+services:
+  app:
+    image: 'jc21/nginx-proxy-manager:latest'
+    ports:
+      - '80:80'
+      - '81:81'
+      - '443:443'
+    volumes:
+      - ./config.json:/app/config/production.json
+      - ./data:/data
+      - ./letsencrypt:/etc/letsencrypt
+  db:
+    image: 'jc21/mariadb-aria:10.4'
+    environment:
+      MYSQL_ROOT_PASSWORD: 'npm'
+      MYSQL_DATABASE: 'npm'
+      MYSQL_USER: 'npm'
+      MYSQL_PASSWORD: 'npm'
+    volumes:
+      - ./data/mysql:/var/lib/mysql
+```
+
+3. Bring up your stack
+
+```bash
+docker-compose up -d
+```
+
+4. Log in to the Admin UI
+
+When your docker container is running, connect to it on port `81` for the admin interface.
+
+[http://127.0.0.1:81](http://127.0.0.1:81)
+
+Default Admin User:
+
+```
+Email:    admin@example.com
+Password: changeme
+```
+
+Immediately after logging in with this default user you will be asked to modify your details and change your password.
--- a/docs/advanced-config/README.md
+++ b/docs/advanced-config/README.md
@ -1,4 +1,20 @@
-## Advanced Nginx Configuration
+# Advanced Configuration
+
+### Disabling IPv6
+
+On some docker hosts IPv6 may not be enabled. In these cases, the following message may be seen in the log:
+
+> Address family not supported by protocol
+
+The easy fix is to add a Docker environment variable to the Nginx Proxy Manager stack:
+
+```yml
+    environment:
+      DISABLE_IPV6: 'true'
+```
+
+
+### Custom Nginx Configurations

 If you are a more advanced user, you might be itching for extra Nginx customizability.

@ -15,3 +31,16 @@ You can add your custom configuration snippet files at `/data/nginx/custom` as f
 `/data/nginx/custom/server_stream_udp.conf`: Included at the end of every UDP stream server block

 Every file is optional.
+
+
+### X-FRAME-OPTIONS Header
+
+You can configure the [`X-FRAME-OPTIONS`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options) header
+value by specifying it as a Docker environment variable. The default if not specified is `deny`.
+
+```yml
+  ...
+  environment:
+    X_FRAME_OPTIONS: "sameorigin"
+  ...
+```
--- a/docs/guide/README.md
+++ b/docs/guide/README.md
@ -0,0 +1 @@
+../../README.md
--- a/docs/package.json
+++ b/docs/package.json
@ -0,0 +1,777 @@
+{
+  "name": "docs",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "dependencies": {
+    "@vuepress/plugin-google-analytics": "^1.4.0",
+    "abbrev": "^1.1.1",
+    "accepts": "^1.3.7",
+    "acorn": "^7.1.1",
+    "agentkeepalive": "^4.1.0",
+    "ajv": "^6.12.0",
+    "ajv-errors": "^1.0.1",
+    "ajv-keywords": "^3.4.1",
+    "algoliasearch": "^4.1.0",
+    "alphanum-sort": "^1.0.2",
+    "ansi-colors": "^4.1.1",
+    "ansi-escapes": "^4.3.1",
+    "ansi-html": "^0.0.7",
+    "ansi-regex": "^5.0.0",
+    "ansi-styles": "^4.2.1",
+    "anymatch": "^3.1.1",
+    "aproba": "^2.0.0",
+    "argparse": "^1.0.10",
+    "arr-diff": "^4.0.0",
+    "arr-flatten": "^1.1.0",
+    "arr-union": "^3.1.0",
+    "array-flatten": "^3.0.0",
+    "array-union": "^2.1.0",
+    "array-uniq": "^2.1.0",
+    "array-unique": "^0.3.2",
+    "asn1": "^0.2.4",
+    "asn1.js": "^5.3.0",
+    "assert": "^2.0.0",
+    "assert-plus": "^1.0.0",
+    "assign-symbols": "^2.0.2",
+    "async": "^3.2.0",
+    "async-each": "^1.0.3",
+    "async-limiter": "^2.0.0",
+    "asynckit": "^0.4.0",
+    "atob": "^2.1.2",
+    "autocomplete.js": "^0.37.1",
+    "autoprefixer": "^9.7.6",
+    "aws-sign2": "^0.7.0",
+    "aws4": "^1.9.1",
+    "babel-loader": "^8.1.0",
+    "babel-plugin-dynamic-import-node": "^2.3.0",
+    "babel-plugin-module-resolver": "^4.0.0",
+    "balanced-match": "^1.0.0",
+    "base": "^3.0.0",
+    "base64-js": "^1.3.1",
+    "batch": "^0.6.1",
+    "bcrypt-pbkdf": "^1.0.2",
+    "big.js": "^5.2.2",
+    "binary-extensions": "^2.0.0",
+    "bluebird": "^3.7.2",
+    "bn.js": "^5.1.1",
+    "body-parser": "^1.19.0",
+    "bonjour": "^3.5.0",
+    "boolbase": "^1.0.0",
+    "brace-expansion": "^1.1.11",
+    "braces": "^3.0.2",
+    "brorand": "^1.1.0",
+    "browserify-aes": "^1.2.0",
+    "browserify-cipher": "^1.0.1",
+    "browserify-des": "^1.0.2",
+    "browserify-rsa": "^4.0.1",
+    "browserify-sign": "^4.0.4",
+    "browserify-zlib": "^0.2.0",
+    "browserslist": "^4.11.1",
+    "buffer": "^5.5.0",
+    "buffer-from": "^1.1.1",
+    "buffer-indexof": "^1.1.1",
+    "buffer-json": "^2.0.0",
+    "buffer-xor": "^2.0.2",
+    "builtin-status-codes": "^3.0.0",
+    "bytes": "^3.1.0",
+    "cac": "^6.5.8",
+    "cacache": "^15.0.0",
+    "cache-base": "^4.0.0",
+    "cache-loader": "^4.1.0",
+    "call-me-maybe": "^1.0.1",
+    "caller-callsite": "^4.1.0",
+    "caller-path": "^3.0.0",
+    "callsites": "^3.1.0",
+    "camel-case": "^4.1.1",
+    "camelcase": "^5.3.1",
+    "caniuse-api": "^3.0.0",
+    "caniuse-lite": "^1.0.30001039",
+    "caseless": "^0.12.0",
+    "chalk": "^4.0.0",
+    "chokidar": "^3.3.1",
+    "chownr": "^2.0.0",
+    "chrome-trace-event": "^1.0.2",
+    "ci-info": "^2.0.0",
+    "cipher-base": "^1.0.4",
+    "class-utils": "^0.3.6",
+    "clean-css": "^4.2.3",
+    "clipboard": "^2.0.6",
+    "cliui": "^6.0.0",
+    "coa": "^2.0.2",
+    "code-point-at": "^1.1.0",
+    "collection-visit": "^1.0.0",
+    "color": "^3.1.2",
+    "color-convert": "^2.0.1",
+    "color-name": "^1.1.4",
+    "color-string": "^1.5.3",
+    "combined-stream": "^1.0.8",
+    "commander": "^5.0.0",
+    "commondir": "^1.0.1",
+    "component-emitter": "^1.3.0",
+    "compressible": "^2.0.18",
+    "compression": "^1.7.4",
+    "concat-map": "^0.0.1",
+    "concat-stream": "^2.0.0",
+    "connect-history-api-fallback": "^1.6.0",
+    "consola": "^2.11.3",
+    "console-browserify": "^1.2.0",
+    "consolidate": "^0.15.1",
+    "constants-browserify": "^1.0.0",
+    "content-disposition": "^0.5.3",
+    "content-type": "^1.0.4",
+    "convert-source-map": "^1.7.0",
+    "cookie": "^0.4.0",
+    "cookie-signature": "^1.1.0",
+    "copy-concurrently": "^1.0.5",
+    "copy-descriptor": "^0.1.1",
+    "copy-webpack-plugin": "^5.1.1",
+    "core-js": "^3.6.4",
+    "core-util-is": "^1.0.2",
+    "cosmiconfig": "^6.0.0",
+    "create-ecdh": "^4.0.3",
+    "create-hash": "^1.2.0",
+    "create-hmac": "^1.1.7",
+    "cross-spawn": "^7.0.2",
+    "crypto-browserify": "^3.12.0",
+    "css": "^2.2.4",
+    "css-color-names": "^1.0.1",
+    "css-declaration-sorter": "^5.1.2",
+    "css-loader": "^3.5.0",
+    "css-parse": "^2.0.0",
+    "css-select": "^2.1.0",
+    "css-select-base-adapter": "^0.1.1",
+    "css-tree": "^1.0.0-alpha.39",
+    "css-unit-converter": "^1.1.1",
+    "css-what": "^3.2.1",
+    "cssesc": "^3.0.0",
+    "cssnano": "^4.1.10",
+    "cssnano-preset-default": "^4.0.7",
+    "cssnano-util-get-arguments": "^4.0.0",
+    "cssnano-util-get-match": "^4.0.0",
+    "cssnano-util-raw-cache": "^4.0.1",
+    "cssnano-util-same-parent": "^4.0.1",
+    "csso": "^4.0.3",
+    "cyclist": "^1.0.1",
+    "dashdash": "^1.14.1",
+    "de-indent": "^1.0.2",
+    "debug": "^4.1.1",
+    "decamelize": "^4.0.0",
+    "decode-uri-component": "^0.2.0",
+    "deep-equal": "^2.0.2",
+    "deepmerge": "^4.2.2",
+    "default-gateway": "^6.0.0",
+    "define-properties": "^1.1.3",
+    "define-property": "^2.0.2",
+    "del": "^5.1.0",
+    "delayed-stream": "^1.0.0",
+    "delegate": "^3.2.0",
+    "depd": "^2.0.0",
+    "des.js": "^1.0.1",
+    "destroy": "^1.0.4",
+    "detect-node": "^2.0.4",
+    "diacritics": "^1.3.0",
+    "diffie-hellman": "^5.0.3",
+    "dir-glob": "^3.0.1",
+    "dns-equal": "^1.0.0",
+    "dns-packet": "^5.2.1",
+    "dns-txt": "^2.0.2",
+    "docsearch.js": "^2.6.3",
+    "dom-converter": "^0.2.0",
+    "dom-serializer": "^0.2.2",
+    "dom-walk": "^0.1.2",
+    "domain-browser": "^4.0.0",
+    "domelementtype": "^2.0.1",
+    "domhandler": "^3.0.0",
+    "domutils": "^2.0.0",
+    "dot-prop": "^5.2.0",
+    "duplexify": "^4.1.1",
+    "ecc-jsbn": "^0.2.0",
+    "ee-first": "^1.1.1",
+    "electron-to-chromium": "^1.3.397",
+    "elliptic": "^6.5.2",
+    "emoji-regex": "^8.0.0",
+    "emojis-list": "^3.0.0",
+    "encodeurl": "^1.0.2",
+    "end-of-stream": "^1.4.4",
+    "enhanced-resolve": "^4.1.1",
+    "entities": "^2.0.0",
+    "envify": "^4.1.0",
+    "envinfo": "^7.5.0",
+    "errno": "^0.1.7",
+    "error-ex": "^1.3.2",
+    "es-abstract": "^1.17.5",
+    "es-to-primitive": "^1.2.1",
+    "es6-promise": "^4.2.8",
+    "escape-html": "^1.0.3",
+    "escape-string-regexp": "^2.0.0",
+    "eslint-scope": "^5.0.0",
+    "esprima": "^4.0.1",
+    "esrecurse": "^4.2.1",
+    "estraverse": "^5.0.0",
+    "esutils": "^2.0.3",
+    "etag": "^1.8.1",
+    "eventemitter3": "^4.0.0",
+    "events": "^3.1.0",
+    "eventsource": "^1.0.7",
+    "evp_bytestokey": "^1.0.3",
+    "execa": "^4.0.0",
+    "expand-brackets": "^4.0.0",
+    "express": "^4.17.1",
+    "extend": "^3.0.2",
+    "extend-shallow": "^3.0.2",
+    "extglob": "^3.0.0",
+    "extsprintf": "^1.4.0",
+    "fast-deep-equal": "^3.1.1",
+    "fast-glob": "^3.2.2",
+    "fast-json-stable-stringify": "^2.1.0",
+    "faye-websocket": "^0.11.3",
+    "figgy-pudding": "^3.5.2",
+    "figures": "^3.2.0",
+    "file-loader": "^6.0.0",
+    "fill-range": "^7.0.1",
+    "finalhandler": "^1.1.2",
+    "find-babel-config": "^1.2.0",
+    "find-cache-dir": "^3.3.1",
+    "find-up": "^4.1.0",
+    "flush-write-stream": "^2.0.0",
+    "follow-redirects": "^1.11.0",
+    "for-in": "^1.0.2",
+    "foreach": "^2.0.5",
+    "forever-agent": "^0.6.1",
+    "form-data": "^3.0.0",
+    "forwarded": "^0.1.2",
+    "fragment-cache": "^0.2.1",
+    "fresh": "^0.5.2",
+    "from2": "^2.3.0",
+    "fs-extra": "^9.0.0",
+    "fs-write-stream-atomic": "^1.0.10",
+    "fs.realpath": "^1.0.0",
+    "function-bind": "^1.1.1",
+    "gensync": "^1.0.0-beta.1",
+    "get-caller-file": "^2.0.5",
+    "get-stream": "^5.1.0",
+    "get-value": "^3.0.1",
+    "getpass": "^0.1.7",
+    "glob": "^7.1.6",
+    "glob-parent": "^5.1.1",
+    "glob-to-regexp": "^0.4.1",
+    "global": "^4.4.0",
+    "globals": "^12.4.0",
+    "globby": "^11.0.0",
+    "good-listener": "^1.2.2",
+    "graceful-fs": "^4.2.3",
+    "gray-matter": "^4.0.2",
+    "handle-thing": "^2.0.1",
+    "har-schema": "^2.0.0",
+    "har-validator": "^5.1.3",
+    "has": "^1.0.3",
+    "has-ansi": "^4.0.0",
+    "has-flag": "^4.0.0",
+    "has-symbols": "^1.0.1",
+    "has-value": "^2.0.2",
+    "has-values": "^2.0.1",
+    "hash-base": "^3.0.4",
+    "hash-sum": "^2.0.0",
+    "hash.js": "^1.1.7",
+    "he": "^1.2.0",
+    "hex-color-regex": "^1.1.0",
+    "hmac-drbg": "^1.0.1",
+    "hogan.js": "^3.0.2",
+    "hpack.js": "^2.1.6",
+    "hsl-regex": "^1.0.0",
+    "hsla-regex": "^1.0.0",
+    "html-comment-regex": "^1.1.2",
+    "html-entities": "^1.2.1",
+    "html-minifier": "^4.0.0",
+    "html-tags": "^3.1.0",
+    "htmlparser2": "^4.1.0",
+    "http-deceiver": "^1.2.7",
+    "http-errors": "^1.7.3",
+    "http-parser-js": "^0.5.2",
+    "http-proxy": "^1.18.0",
+    "http-proxy-middleware": "^1.0.3",
+    "http-signature": "^1.3.4",
+    "https-browserify": "^1.0.0",
+    "iconv-lite": "^0.5.1",
+    "icss-replace-symbols": "^1.1.0",
+    "icss-utils": "^4.1.1",
+    "ieee754": "^1.1.13",
+    "iferr": "^1.0.2",
+    "ignore": "^5.1.4",
+    "immediate": "^3.2.3",
+    "import-cwd": "^3.0.0",
+    "import-fresh": "^3.2.1",
+    "import-from": "^3.0.0",
+    "import-local": "^3.0.2",
+    "imurmurhash": "^0.1.4",
+    "indexes-of": "^1.0.1",
+    "infer-owner": "^1.0.4",
+    "inflight": "^1.0.6",
+    "inherits": "^2.0.4",
+    "internal-ip": "^6.0.0",
+    "invariant": "^2.2.4",
+    "invert-kv": "^3.0.0",
+    "ip": "^1.1.5",
+    "ip-regex": "^4.1.0",
+    "ipaddr.js": "^1.9.1",
+    "is-absolute-url": "^3.0.3",
+    "is-accessor-descriptor": "^3.0.1",
+    "is-arguments": "^1.0.4",
+    "is-arrayish": "^0.3.2",
+    "is-binary-path": "^2.1.0",
+    "is-buffer": "^2.0.4",
+    "is-callable": "^1.1.5",
+    "is-color-stop": "^1.1.0",
+    "is-data-descriptor": "^2.0.0",
+    "is-date-object": "^1.0.2",
+    "is-descriptor": "^3.0.0",
+    "is-directory": "^0.3.1",
+    "is-extendable": "^1.0.1",
+    "is-extglob": "^2.1.1",
+    "is-fullwidth-code-point": "^3.0.0",
+    "is-glob": "^4.0.1",
+    "is-number": "^7.0.0",
+    "is-obj": "^2.0.0",
+    "is-path-cwd": "^2.2.0",
+    "is-path-in-cwd": "^3.0.0",
+    "is-path-inside": "^3.0.2",
+    "is-plain-obj": "^2.1.0",
+    "is-plain-object": "^3.0.0",
+    "is-regex": "^1.0.5",
+    "is-resolvable": "^1.1.0",
+    "is-stream": "^2.0.0",
+    "is-svg": "^4.2.1",
+    "is-symbol": "^1.0.3",
+    "is-typedarray": "^1.0.0",
+    "is-windows": "^1.0.2",
+    "is-wsl": "^2.1.1",
+    "isarray": "^2.0.5",
+    "isexe": "^2.0.0",
+    "isobject": "^4.0.0",
+    "isstream": "^0.1.2",
+    "javascript-stringify": "^2.0.1",
+    "js-levenshtein": "^1.1.6",
+    "js-tokens": "^5.0.0",
+    "js-yaml": "^3.13.1",
+    "jsbn": "^1.1.0",
+    "jsesc": "^2.5.2",
+    "json-parse-better-errors": "^1.0.2",
+    "json-schema": "^0.2.5",
+    "json-schema-traverse": "^0.4.1",
+    "json-stringify-safe": "^5.0.1",
+    "json3": "^3.3.3",
+    "json5": "^2.1.3",
+    "jsonfile": "^6.0.1",
+    "jsprim": "^2.0.0",
+    "killable": "^1.0.1",
+    "kind-of": "^6.0.3",
+    "last-call-webpack-plugin": "^3.0.0",
+    "lcid": "^3.1.1",
+    "linkify-it": "^2.2.0",
+    "load-script": "^1.0.0",
+    "loader-runner": "^3.1.0",
+    "loader-utils": "^2.0.0",
+    "locate-path": "^5.0.0",
+    "lodash": "^4.17.15",
+    "lodash._reinterpolate": "^3.0.0",
+    "lodash.chunk": "^4.2.0",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.debounce": "^4.0.8",
+    "lodash.kebabcase": "^4.1.1",
+    "lodash.memoize": "^4.1.2",
+    "lodash.padstart": "^4.6.1",
+    "lodash.sortby": "^4.7.0",
+    "lodash.template": "^4.5.0",
+    "lodash.templatesettings": "^4.2.0",
+    "lodash.uniq": "^4.5.0",
+    "loglevel": "^1.6.7",
+    "loose-envify": "^1.4.0",
+    "lower-case": "^2.0.1",
+    "lru-cache": "^5.1.1",
+    "make-dir": "^3.0.2",
+    "mamacro": "^0.0.7",
+    "map-age-cleaner": "^0.1.3",
+    "map-cache": "^0.2.2",
+    "map-visit": "^1.0.0",
+    "markdown-it": "^10.0.0",
+    "markdown-it-anchor": "^5.2.7",
+    "markdown-it-chain": "^1.3.0",
+    "markdown-it-container": "^2.0.0",
+    "markdown-it-emoji": "^1.4.0",
+    "markdown-it-table-of-contents": "^0.4.4",
+    "md5.js": "^1.3.5",
+    "mdn-data": "^2.0.8",
+    "mdurl": "^1.0.1",
+    "media-typer": "^1.1.0",
+    "mem": "^6.0.1",
+    "memory-fs": "^0.5.0",
+    "merge-descriptors": "^1.0.1",
+    "merge-source-map": "^1.1.0",
+    "merge2": "^1.3.0",
+    "methods": "^1.1.2",
+    "micromatch": "^4.0.2",
+    "miller-rabin": "^4.0.1",
+    "mime": "^2.4.4",
+    "mime-db": "^1.43.0",
+    "mime-types": "^2.1.26",
+    "mimic-fn": "^3.0.0",
+    "min-document": "^2.19.0",
+    "mini-css-extract-plugin": "^0.9.0",
+    "minimalistic-assert": "^1.0.1",
+    "minimalistic-crypto-utils": "^1.0.1",
+    "minimatch": "^3.0.4",
+    "minimist": "^1.2.5",
+    "mississippi": "^4.0.0",
+    "mixin-deep": "^2.0.1",
+    "mkdirp": "^1.0.4",
+    "move-concurrently": "^1.0.1",
+    "ms": "^2.1.2",
+    "multicast-dns": "^7.2.2",
+    "multicast-dns-service-types": "^1.1.0",
+    "nanomatch": "^1.2.13",
+    "negotiator": "^0.6.2",
+    "neo-async": "^2.6.1",
+    "nice-try": "^2.0.1",
+    "no-case": "^3.0.3",
+    "node-forge": "^0.9.1",
+    "node-libs-browser": "^2.2.1",
+    "node-releases": "^1.1.53",
+    "nopt": "^4.0.3",
+    "normalize-path": "^3.0.0",
+    "normalize-range": "^0.1.2",
+    "normalize-url": "^5.0.0",
+    "npm-run-path": "^4.0.1",
+    "nprogress": "^0.2.0",
+    "nth-check": "^1.0.2",
+    "num2fraction": "^1.2.2",
+    "number-is-nan": "^2.0.0",
+    "oauth-sign": "^0.9.0",
+    "object-assign": "^4.1.1",
+    "object-copy": "^1.0.0",
+    "object-inspect": "^1.7.0",
+    "object-is": "^1.0.2",
+    "object-keys": "^1.1.1",
+    "object-visit": "^1.0.1",
+    "object.assign": "^4.1.0",
+    "object.getownpropertydescriptors": "^2.1.0",
+    "object.pick": "^1.3.0",
+    "object.values": "^1.1.1",
+    "obuf": "^1.1.2",
+    "on-finished": "^2.3.0",
+    "on-headers": "^1.0.2",
+    "once": "^1.4.0",
+    "opencollective-postinstall": "^2.0.2",
+    "opn": "^6.0.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.3",
+    "original": "^1.0.2",
+    "os-browserify": "^0.3.0",
+    "os-locale": "^5.0.0",
+    "p-defer": "^3.0.0",
+    "p-finally": "^2.0.1",
+    "p-is-promise": "^3.0.0",
+    "p-limit": "^2.3.0",
+    "p-locate": "^4.1.0",
+    "p-map": "^4.0.0",
+    "p-retry": "^4.2.0",
+    "p-try": "^2.2.0",
+    "pako": "^1.0.11",
+    "parallel-transform": "^1.2.0",
+    "param-case": "^3.0.3",
+    "parse-asn1": "^5.1.5",
+    "parse-json": "^5.0.0",
+    "parseurl": "^1.3.3",
+    "pascalcase": "^1.0.0",
+    "path-browserify": "^1.0.1",
+    "path-dirname": "^1.0.2",
+    "path-exists": "^4.0.0",
+    "path-is-absolute": "^2.0.0",
+    "path-is-inside": "^1.0.2",
+    "path-key": "^3.1.1",
+    "path-parse": "^1.0.6",
+    "path-to-regexp": "^6.1.0",
+    "path-type": "^4.0.0",
+    "pbkdf2": "^3.0.17",
+    "performance-now": "^2.1.0",
+    "pify": "^5.0.0",
+    "pinkie": "^2.0.4",
+    "pinkie-promise": "^2.0.1",
+    "pkg-dir": "^4.2.0",
+    "pkg-up": "^3.1.0",
+    "portfinder": "^1.0.25",
+    "posix-character-classes": "^1.0.0",
+    "postcss": "^7.0.27",
+    "postcss-calc": "^7.0.2",
+    "postcss-colormin": "^4.0.3",
+    "postcss-convert-values": "^4.0.1",
+    "postcss-discard-comments": "^4.0.2",
+    "postcss-discard-duplicates": "^4.0.2",
+    "postcss-discard-empty": "^4.0.1",
+    "postcss-discard-overridden": "^4.0.1",
+    "postcss-load-config": "^2.1.0",
+    "postcss-loader": "^3.0.0",
+    "postcss-merge-longhand": "^4.0.11",
+    "postcss-merge-rules": "^4.0.3",
+    "postcss-minify-font-values": "^4.0.2",
+    "postcss-minify-gradients": "^4.0.2",
+    "postcss-minify-params": "^4.0.2",
+    "postcss-minify-selectors": "^4.0.2",
+    "postcss-modules-extract-imports": "^2.0.0",
+    "postcss-modules-local-by-default": "^3.0.2",
+    "postcss-modules-scope": "^2.2.0",
+    "postcss-modules-values": "^3.0.0",
+    "postcss-normalize-charset": "^4.0.1",
+    "postcss-normalize-display-values": "^4.0.2",
+    "postcss-normalize-positions": "^4.0.2",
+    "postcss-normalize-repeat-style": "^4.0.2",
+    "postcss-normalize-string": "^4.0.2",
+    "postcss-normalize-timing-functions": "^4.0.2",
+    "postcss-normalize-unicode": "^4.0.1",
+    "postcss-normalize-url": "^4.0.1",
+    "postcss-normalize-whitespace": "^4.0.2",
+    "postcss-ordered-values": "^4.1.2",
+    "postcss-reduce-initial": "^4.0.3",
+    "postcss-reduce-transforms": "^4.0.2",
+    "postcss-safe-parser": "^4.0.2",
+    "postcss-selector-parser": "^6.0.2",
+    "postcss-svgo": "^4.0.2",
+    "postcss-unique-selectors": "^4.0.1",
+    "postcss-value-parser": "^4.0.3",
+    "prepend-http": "^3.0.1",
+    "prettier": "^2.0.4",
+    "pretty-error": "^2.1.1",
+    "pretty-time": "^1.1.0",
+    "prismjs": "^1.20.0",
+    "private": "^0.1.8",
+    "process": "^0.11.10",
+    "process-nextick-args": "^2.0.1",
+    "promise-inflight": "^1.0.1",
+    "proxy-addr": "^2.0.6",
+    "prr": "^1.0.1",
+    "pseudomap": "^1.0.2",
+    "psl": "^1.8.0",
+    "public-encrypt": "^4.0.3",
+    "pump": "^3.0.0",
+    "pumpify": "^2.0.1",
+    "punycode": "^2.1.1",
+    "q": "^1.5.1",
+    "qs": "^6.9.3",
+    "query-string": "^6.12.0",
+    "querystring": "^0.2.0",
+    "querystring-es3": "^0.2.1",
+    "querystringify": "^2.1.1",
+    "randombytes": "^2.1.0",
+    "randomfill": "^1.0.4",
+    "range-parser": "^1.2.1",
+    "raw-body": "^2.4.1",
+    "readable-stream": "^3.6.0",
+    "readdirp": "^3.4.0",
+    "reduce": "^1.0.2",
+    "regenerate": "^1.4.0",
+    "regenerate-unicode-properties": "^8.2.0",
+    "regenerator-runtime": "^0.13.5",
+    "regenerator-transform": "^0.14.4",
+    "regex-not": "^1.0.2",
+    "regexp.prototype.flags": "^1.3.0",
+    "regexpu-core": "^4.7.0",
+    "regjsgen": "^0.5.1",
+    "regjsparser": "^0.6.4",
+    "relateurl": "^0.2.7",
+    "remove-trailing-separator": "^1.1.0",
+    "renderkid": "^2.0.3",
+    "repeat-element": "^1.1.3",
+    "repeat-string": "^1.6.1",
+    "request": "^2.88.2",
+    "require-directory": "^2.1.1",
+    "require-main-filename": "^2.0.0",
+    "requires-port": "^1.0.0",
+    "reselect": "^4.0.0",
+    "resolve": "^1.15.1",
+    "resolve-cwd": "^3.0.0",
+    "resolve-from": "^5.0.0",
+    "resolve-url": "^0.2.1",
+    "ret": "^0.3.1",
+    "retry": "^0.12.0",
+    "rgb-regex": "^1.0.1",
+    "rgba-regex": "^1.0.0",
+    "rimraf": "^3.0.2",
+    "ripemd160": "^2.0.2",
+    "run-queue": "^2.0.1",
+    "safe-buffer": "^5.2.0",
+    "safe-regex": "^2.1.1",
+    "safer-buffer": "^2.1.2",
+    "sax": "^1.2.4",
+    "schema-utils": "^2.6.5",
+    "section-matter": "^1.0.0",
+    "select": "^1.1.2",
+    "select-hose": "^2.0.0",
+    "selfsigned": "^1.10.7",
+    "semver": "^7.2.1",
+    "send": "^0.17.1",
+    "serialize-javascript": "^3.0.0",
+    "serve-index": "^1.9.1",
+    "serve-static": "^1.14.1",
+    "set-blocking": "^2.0.0",
+    "set-value": "^3.0.2",
+    "setimmediate": "^1.0.5",
+    "setprototypeof": "^1.2.0",
+    "sha.js": "^2.4.11",
+    "shebang-command": "^2.0.0",
+    "shebang-regex": "^3.0.0",
+    "signal-exit": "^3.0.3",
+    "simple-swizzle": "^0.2.2",
+    "sitemap": "^6.1.0",
+    "slash": "^3.0.0",
+    "smoothscroll-polyfill": "^0.4.4",
+    "snapdragon": "^0.12.0",
+    "snapdragon-node": "^3.0.0",
+    "snapdragon-util": "^5.0.1",
+    "sockjs": "^0.3.20",
+    "sockjs-client": "^1.4.0",
+    "sort-keys": "^4.0.0",
+    "source-list-map": "^2.0.1",
+    "source-map": "^0.7.3",
+    "source-map-resolve": "^0.6.0",
+    "source-map-support": "^0.5.16",
+    "source-map-url": "^0.4.0",
+    "spdy": "^4.0.2",
+    "spdy-transport": "^3.0.0",
+    "split-string": "^6.1.0",
+    "sprintf-js": "^1.1.2",
+    "sshpk": "^1.16.1",
+    "ssri": "^8.0.0",
+    "stable": "^0.1.8",
+    "stack-utils": "^2.0.1",
+    "static-extend": "^0.1.2",
+    "statuses": "^1.5.0",
+    "std-env": "^2.2.1",
+    "stream-browserify": "^2.0.2",
+    "stream-each": "^1.2.3",
+    "stream-http": "^3.1.0",
+    "stream-shift": "^1.0.1",
+    "strict-uri-encode": "^2.0.0",
+    "string-width": "^4.2.0",
+    "string.prototype.trimleft": "^2.1.2",
+    "string.prototype.trimright": "^2.1.2",
+    "string_decoder": "^1.3.0",
+    "strip-ansi": "^6.0.0",
+    "strip-bom-string": "^1.0.0",
+    "strip-eof": "^2.0.0",
+    "stylehacks": "^4.0.3",
+    "stylus": "^0.54.7",
+    "stylus-loader": "^3.0.2",
+    "supports-color": "^7.1.0",
+    "svg-tags": "^1.0.0",
+    "svgo": "^1.3.2",
+    "tapable": "^1.1.3",
+    "terser": "^4.6.10",
+    "terser-webpack-plugin": "^2.3.5",
+    "text-table": "^0.2.0",
+    "through": "^2.3.8",
+    "through2": "^3.0.1",
+    "thunky": "^1.1.0",
+    "timers-browserify": "^2.0.11",
+    "timsort": "^0.3.0",
+    "tiny-emitter": "^2.1.0",
+    "to-arraybuffer": "^1.0.1",
+    "to-factory": "^1.0.0",
+    "to-fast-properties": "^3.0.1",
+    "to-object-path": "^0.3.0",
+    "to-regex": "^3.0.2",
+    "to-regex-range": "^5.0.1",
+    "toidentifier": "^1.0.0",
+    "toml": "^3.0.0",
+    "toposort": "^2.0.2",
+    "tough-cookie": "^4.0.0",
+    "tr46": "^2.0.2",
+    "tslib": "^1.11.1",
+    "tty-browserify": "^0.0.1",
+    "tunnel-agent": "^0.6.0",
+    "tweetnacl": "^1.0.3",
+    "type-fest": "^0.13.0",
+    "type-is": "^1.6.18",
+    "typedarray": "^0.0.6",
+    "uc.micro": "^1.0.6",
+    "uglify-js": "^3.8.1",
+    "unicode-canonical-property-names-ecmascript": "^1.0.4",
+    "unicode-match-property-ecmascript": "^1.0.4",
+    "unicode-match-property-value-ecmascript": "^1.2.0",
+    "unicode-property-aliases-ecmascript": "^1.1.0",
+    "union-value": "^2.0.1",
+    "uniq": "^1.0.1",
+    "uniqs": "^2.0.0",
+    "unique-filename": "^1.1.1",
+    "unique-slug": "^2.0.2",
+    "universalify": "^1.0.0",
+    "unpipe": "^1.0.0",
+    "unquote": "^1.1.1",
+    "unset-value": "^1.0.0",
+    "upath": "^1.2.0",
+    "upper-case": "^2.0.1",
+    "uri-js": "^4.2.2",
+    "urix": "^0.1.0",
+    "url": "^0.11.0",
+    "url-loader": "^4.0.0",
+    "url-parse": "^1.4.7",
+    "use": "^3.1.1",
+    "util": "^0.12.2",
+    "util-deprecate": "^1.0.2",
+    "util.promisify": "^1.0.1",
+    "utila": "^0.4.0",
+    "utils-merge": "^1.0.1",
+    "uuid": "^7.0.3",
+    "vary": "^1.1.2",
+    "vendors": "^1.0.4",
+    "verror": "^1.10.0",
+    "vm-browserify": "^1.1.2",
+    "vue": "^2.6.11",
+    "vue-hot-reload-api": "^2.3.4",
+    "vue-loader": "^15.9.1",
+    "vue-router": "^3.1.6",
+    "vue-server-renderer": "^2.6.11",
+    "vue-style-loader": "^4.1.2",
+    "vue-template-compiler": "^2.6.11",
+    "vue-template-es2015-compiler": "^1.9.1",
+    "vuepress": "^1.4.0",
+    "vuepress-html-webpack-plugin": "^3.2.0",
+    "vuepress-plugin-container": "^2.1.2",
+    "vuepress-plugin-sitemap": "^2.3.1",
+    "vuepress-plugin-smooth-scroll": "^0.0.9",
+    "vuepress-plugin-zooming": "^1.1.7",
+    "watchpack": "^1.6.1",
+    "wbuf": "^1.7.3",
+    "webidl-conversions": "^6.0.0",
+    "webpack": "^4.42.1",
+    "webpack-chain": "^6.4.0",
+    "webpack-dev-middleware": "^3.7.2",
+    "webpack-dev-server": "^3.10.3",
+    "webpack-log": "^3.0.1",
+    "webpack-merge": "^4.2.2",
+    "webpack-sources": "^1.4.3",
+    "webpackbar": "^4.0.0",
+    "websocket-driver": "^0.7.3",
+    "websocket-extensions": "^0.1.3",
+    "whatwg-url": "^8.0.0",
+    "when": "^3.7.8",
+    "which": "^2.0.2",
+    "which-module": "^2.0.0",
+    "worker-farm": "^1.7.0",
+    "wrap-ansi": "^6.2.0",
+    "wrappy": "^1.0.2",
+    "ws": "^7.2.3",
+    "xmlbuilder": "^15.1.0",
+    "xtend": "^4.0.2",
+    "y18n": "^4.0.0",
+    "yallist": "^4.0.0",
+    "yargs": "^15.3.1",
+    "yargs-parser": "^18.1.2",
+    "zepto": "^1.2.0"
+  },
+  "devDependencies": {},
+  "scripts": {
+    "dev": "vuepress dev",
+    "build": "vuepress build"
+  },
+  "author": "",
+  "license": "ISC"
+}
--- a/docs/screenshots/README.md
+++ b/docs/screenshots/README.md
@ -0,0 +1,12 @@
+# Screenshots
+
+<img class="no-medium-zoom zooming" src="/screenshots/login.png" alt="Login" title="Login" width="200"/>
+<img class="no-medium-zoom zooming" src="/screenshots/dashboard.png" alt="Dashboard" title="Dashboard" width="200"/>
+<img class="no-medium-zoom zooming" src="/screenshots/proxy-hosts.png" alt="Proxy Hosts" title="Proxy Hosts" width="200"/>
+<img class="no-medium-zoom zooming" src="/screenshots/proxy-hosts-add.png" alt="Add Proxy Host" title="Add Proxy Host" width="200"/>
+<img class="no-medium-zoom zooming" src="/screenshots/redirection-hosts.png" alt="Redirection Hosts" title="Redirection Hosts" width="200"/>
+<img class="no-medium-zoom zooming" src="/screenshots/dead-hosts.png" alt="404 Hosts" title="404 Hosts" width="200"/>
+<img class="no-medium-zoom zooming" src="/screenshots/permissions.png" alt="User Permissions" title="User Permissions" width="200"/>
+<img class="no-medium-zoom zooming" src="/screenshots/certificates.png" alt="Certificates" title="Certificates" width="200"/>
+<img class="no-medium-zoom zooming" src="/screenshots/audit-log.png" alt="Audit Log" title="Audit Log" width="200"/>
+<img class="no-medium-zoom zooming" src="/screenshots/custom-settings.png" alt="Custom Settings" title="Custom Settings" width="200"/>
--- a/docs/setup/README.md
+++ b/docs/setup/README.md
@ -1,13 +1,4 @@
-## Installation and Configuration
-
-If you just want to get up and running in the quickest time possible, grab all the files in
-the [doc/example/](https://github.com/jc21/nginx-proxy-manager/tree/master/doc/example)
-folder and run:
-
-```bash
-docker-compose up -d
-```
-
+# Full Setup Instructions

 ### Configuration File

@ -15,7 +6,7 @@ docker-compose up -d

 Don't worry, this is easy to do.

-The app requires a configuration file to let it know what database you're using.
+The app requires a configuration file to let it know what database you're using. By default, this file is called `config.json`

 Here's an example configuration for `mysql` (or mariadb) that is compatible with the docker-compose example below:

@ -48,6 +39,12 @@ This app doesn't come with a database, you have to provide one yourself. Current
 It's easy to use another docker container for your database also and link it as part of the docker stack, so that's what the following examples
 are going to use.

+::: warning
+
+When using a `mariadb` database, the NPM configuration file should still use the `mysql` engine!
+
+:::
+

 ### Running the App

@ -61,11 +58,14 @@ services:
    restart: always
    ports:
      # Public HTTP Port:
-      - 80:80
+      - '80:80'
      # Public HTTPS Port:
-      - 443:443
+      - '443:443'
      # Admin Web Port:
-      - 81:81
+      - '81:81'
+    environment:
+      # Uncomment this if IPv6 is not enabled on your host
+      # DISABLE_IPV6: 'true'
    volumes:
      # Make sure this config.json file exists as per instructions above:
      - ./config.json:/app/config/production.json
@ -74,13 +74,13 @@ services:
    depends_on:
      - db
  db:
-    image: jc21/mariadb-aria:latest
+    image: jc21/mariadb-aria:10.4
    restart: always
    environment:
-      MYSQL_ROOT_PASSWORD: "npm"
-      MYSQL_DATABASE: "npm"
-      MYSQL_USER: "npm"
-      MYSQL_PASSWORD: "npm"
+      MYSQL_ROOT_PASSWORD: 'npm'
+      MYSQL_DATABASE: 'npm'
+      MYSQL_USER: 'npm'
+      MYSQL_PASSWORD: 'npm'
    volumes:
      - ./data/mysql:/var/lib/mysql
 ```
@ -91,6 +91,7 @@ Then:
 docker-compose up -d
 ```

+The config file (config.json) must be present in this directory.

 ### Running on Raspberry PI / ARM devices

@ -114,9 +115,9 @@ on Raspbian.

 After the app is running for the first time, the following will happen:

- The database will initialize with table structures
- GPG keys will be generated and saved in the configuration file
- A default admin user will be created
+1. The database will initialize with table structures
+2. GPG keys will be generated and saved in the configuration file
+3. A default admin user will be created

 This process can take a couple of minutes depending on your machine.

@ -129,22 +130,3 @@ Password: changeme
 ```

 Immediately after logging in with this default user you will be asked to modify your details and change your password.
-
-
-### Advanced Options
-
-#### X-FRAME-OPTIONS Header
-
-You can configure the [`X-FRAME-OPTIONS`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options) header
-value by specifying it as a Docker environment variable. The default if not specified is `deny`.
-
-```yml
-  ...
-  environment:
-    X_FRAME_OPTIONS: "sameorigin"
-  ...
-```
-
-```
-... -e "X_FRAME_OPTIONS=sameorigin" ...
-```
--- a/docs/third-party/README.md
+++ b/docs/third-party/README.md
@ -0,0 +1,12 @@
+# Third Party
+
+As this software gains popularity it's common to see it integrated with other platforms. Please be aware that unless specifically mentioned in the documenation of those
+integrations, they are *not supported* by me.
+
+Known integrations:
+
+- [HomeAssistant Hass.io plugin](https://github.com/hassio-addons/addon-nginx-proxy-manager)
+- [UnRaid / Synology](https://github.com/jlesage/docker-nginx-proxy-manager)
+
+If you would like your integration of NPM listed, please open a
+[Github issue](https://github.com/jc21/nginx-proxy-manager/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=)
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
--- a/frontend/app-images/favicons/android-chrome-192x192.png
+++ b/frontend/app-images/favicons/android-chrome-192x192.png
--- a/frontend/app-images/favicons/android-chrome-512x512.png
+++ b/frontend/app-images/favicons/android-chrome-512x512.png
--- a/frontend/app-images/favicons/apple-touch-icon.png
+++ b/frontend/app-images/favicons/apple-touch-icon.png
--- a/frontend/app-images/favicons/browserconfig.xml
+++ b/frontend/app-images/favicons/browserconfig.xml
@ -2,8 +2,8 @@
 <browserconfig>
    <msapplication>
        <tile>
-            <square150x150logo src="/images/favicon/mstile-150x150.png"/>
-            <TileColor>#f0ad00</TileColor>
+            <square150x150logo src="/images/favicons/mstile-150x150.png"/>
+            <TileColor>#333333</TileColor>
        </tile>
    </msapplication>
 </browserconfig>
--- a/frontend/app-images/favicons/favicon-16x16.png
+++ b/frontend/app-images/favicons/favicon-16x16.png
--- a/frontend/app-images/favicons/favicon-32x32.png
+++ b/frontend/app-images/favicons/favicon-32x32.png
--- a/frontend/app-images/favicons/favicon.ico
+++ b/frontend/app-images/favicons/favicon.ico
--- a/frontend/app-images/favicons/mstile-150x150.png
+++ b/frontend/app-images/favicons/mstile-150x150.png
--- a/frontend/app-images/favicons/safari-pinned-tab.svg
+++ b/frontend/app-images/favicons/safari-pinned-tab.svg
@ -9,24 +9,77 @@ Created by potrace 1.11, written by Peter Selinger 2001-2013
 </metadata>
 <g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"
 fill="#000000" stroke="none">
-<path d="M2384 5110 c-1036 -74 -1922 -761 -2248 -1743 -146 -437 -170 -915
-70 -1367 193 -869 838 -1582 1687 -1864 437 -146 915 -170 1367 -70 632 141
-1204 533 1564 1074 222 333 358 697 412 1100 22 167 22 473 0 640 -96 722
-473 1348 -1062 1767 -472 335 -1074 504 -1650 463z m1514 -1050 c173 -18 201
-52 210 -250 8 -190 -30 -414 -110 -655 -112 -338 -282 -619 -509 -842 -131
-130 -233 -203 -384 -278 -211 -105 -410 -162 -663 -188 l-114 -12 -97 -109
-c-201 -228 -505 -449 -846 -616 -210 -102 -316 -133 -338 -98 -25 39 106 345
-248 578 166 275 296 430 548 657 36 32 47 49 47 72 l0 30 -137 -66 c-229 -109
-615 -273 -644 -273 -15 0 -35 7 -43 16 -24 24 -20 109 8 169 38 82 425 784
-473 860 88 136 163 193 292 221 71 15 247 18 324 5 l48 -8 49 61 c305 381 900
-682 1434 726 50 4 96 8 101 8 6 1 52 -3 103 -8z m-558 -2245 c-21 -148 -73
-226 -214 -319 -97 -64 -842 -472 -899 -492 -47 -17 -110 -18 -138 -4 -13 7
-19 21 -19 44 0 29 102 278 230 563 36 81 28 76 165 88 273 25 602 139 810
-283 l70 48 3 -65 c2 -36 -2 -102 -8 -146z"/>
-<path d="M3580 3711 c-72 -23 -112 -76 -112 -151 0 -88 62 -152 150 -153 194
-3 214 278 22 307 -19 3 -46 1 -60 -3z"/>
-<path d="M3035 3392 c-68 -33 -128 -93 -158 -161 -31 -69 -29 -178 5 -252 54
-117 159 -184 288 -184 96 1 169 33 234 106 60 66 80 129 74 228 -7 118 -59
-201 -160 256 -44 24 -67 30 -138 33 -77 3 -90 1 -145 -26z"/>
+<path d="M2348 4766 c-109 -63 -203 -116 -210 -120 -7 -3 -20 -10 -28 -16 -19
+-12 -114 -68 -410 -238 -481 -276 -1017 -586 -1087 -628 -39 -23 -73 -40 -76
+-38 -3 3 -5 -519 -5 -1160 l0 -1165 292 -169 c293 -170 727 -421 801 -462 22
+-12 99 -56 170 -98 167 -96 690 -399 732 -423 l32 -18 207 120 c114 66 226
+131 248 143 23 13 214 124 426 246 212 122 401 231 420 242 19 11 127 73 240
+138 213 123 225 130 383 220 61 35 95 60 92 68 -3 7 0 10 5 7 11 -7 7 36 -4
+54 -4 5 -2 13 4 16 8 5 7 12 -2 23 -10 12 -10 14 0 8 6 -4 12 -2 12 3 0 6 -6
+11 -12 11 -10 0 -9 3 1 9 10 6 10 10 1 16 -9 6 -9 9 0 15 9 6 9 12 0 30 -9 17
+-9 21 0 15 14 -9 10 27 -5 37 -6 5 -6 8 2 8 11 0 10 30 -2 49 -3 5 -1 13 5 16
+8 5 7 11 -1 22 -10 11 -10 16 0 22 10 7 11 13 1 31 -8 15 -8 20 -1 16 6 -4 11
+-3 11 3 0 5 -5 13 -11 17 -8 5 -8 9 1 14 9 6 9 12 0 30 -8 15 -8 20 -1 16 15
+-10 14 7 -1 22 -9 9 -9 12 0 12 12 0 12 26 -1 46 -3 6 -3 14 0 18 10 10 11
+256 1 262 -4 3 -4 13 2 23 6 12 5 22 -3 31 -9 10 -9 11 1 6 6 -4 12 -2 12 3 0
+6 -5 11 -10 11 -7 0 -7 6 0 20 6 11 7 20 1 20 -12 0 -9 33 4 43 6 6 5 10 -3
+14 -10 4 -10 8 0 21 10 12 10 14 1 8 -7 -4 -13 -2 -13 3 0 6 6 11 13 11 9 0 8
+3 -2 9 -11 7 -11 10 0 15 11 5 11 7 1 12 -10 5 -10 9 0 22 10 12 10 14 1 8 -7
+-4 -13 -2 -13 3 0 6 6 11 13 11 9 0 8 3 -2 9 -11 7 -11 10 0 15 11 5 11 7 1
+12 -10 5 -10 9 0 22 10 12 10 14 1 8 -7 -4 -13 -2 -13 3 0 6 6 11 13 11 9 0 8
+3 -2 9 -11 7 -11 10 0 15 11 5 11 7 1 12 -10 5 -10 9 0 22 10 12 10 14 1 8 -7
+-4 -13 -3 -13 3 0 5 6 12 13 15 9 5 9 7 0 12 -9 4 -10 11 -3 25 7 13 7 19 1
+19 -7 0 -7 8 -1 24 6 16 5 27 -3 35 -8 8 -8 14 -2 19 15 10 17 32 5 46 -5 7
+-7 16 -3 20 12 12 10 190 -2 198 -7 5 -7 8 1 8 12 0 12 29 -1 49 -5 10 -4 12
+3 7 7 -4 12 -3 12 3 0 5 -5 13 -11 17 -8 5 -8 9 1 14 9 6 9 12 0 30 -8 15 -8
+20 -1 16 6 -4 11 -3 11 3 0 5 -5 13 -11 17 -8 5 -8 9 1 14 9 6 9 12 0 30 -8
+16 -9 20 -1 15 12 -7 9 34 -3 54 -4 5 -2 13 4 16 8 5 7 12 -2 23 -10 12 -10
+14 0 8 6 -4 12 -2 12 3 0 6 -6 11 -12 11 -10 0 -9 3 1 9 10 6 10 10 1 16 -9 6
+-9 9 0 15 9 6 9 12 0 30 -9 17 -9 21 0 15 14 -9 10 27 -5 37 -6 5 -6 8 2 8 11
+0 10 36 -2 48 -2 3 0 11 6 18 7 8 7 14 -1 19 -5 3 -10 12 -10 18 0 7 4 6 10
+-3 8 -12 9 -9 8 12 -2 24 -34 45 -313 206 -458 265 -1024 592 -1070 617 -22
+13 -174 100 -338 194 -165 94 -304 171 -310 171 -7 0 -101 -52 -209 -114z
+m347 -191 c33 -19 85 -49 116 -66 l56 -32 0 -174 -1 -174 -68 -40 c-80 -47
+-184 -105 -214 -120 -18 -9 -43 1 -165 71 -79 46 -146 84 -148 86 -2 2 -4 17
+-4 34 0 36 -6 36 -102 11 -204 -54 -409 -148 -565 -259 -164 -116 -329 -287
+-433 -447 -105 -163 -197 -382 -232 -554 -16 -78 -20 -102 -30 -191 -7 -50 -6
+-247 0 -300 3 -25 7 -69 10 -99 3 -29 8 -57 10 -61 7 -11 -5 -40 -16 -40 -4 0
+-35 -16 -68 -35 -64 -38 -77 -42 -78 -22 -1 19 -14 91 -18 105 -25 73 -25 511
+0 584 2 7 6 27 8 43 12 77 66 267 97 340 116 269 219 425 399 606 173 172 297
+262 506 364 144 71 261 112 412 146 l101 23 -2 50 -1 50 149 88 150 87 35 -20
+c20 -10 63 -35 96 -54z m512 -300 c296 -108 565 -305 798 -586 96 -115 237
+-374 288 -529 100 -300 129 -643 77 -900 -6 -30 -13 -68 -16 -85 -4 -28 -23
+-98 -57 -207 l-15 -48 47 -25 46 -25 0 -175 0 -174 -110 -62 c-60 -35 -127
+-74 -148 -88 -45 -29 -21 -38 -253 97 l-91 53 1 174 c1 95 3 175 6 177 3 3 69
+41 148 86 141 80 144 81 173 67 16 -9 29 -13 29 -10 0 3 0 7 0 10 0 3 7 22 14
+42 21 55 55 211 63 290 9 85 10 330 0 403 -21 171 -95 421 -159 534 -5 11 -22
+40 -36 65 -140 253 -346 467 -597 621 -75 46 -204 108 -270 131 -22 7 -43 16
+-48 19 -6 5 -12 143 -8 173 2 12 16 9 118 -28z m-231 -776 c645 -372 604 -346
+605 -377 0 -15 1 -278 1 -586 l1 -558 -29 -24 c-16 -13 -32 -23 -35 -24 -4 0
+-421 -236 -529 -300 -8 -4 -109 -63 -223 -129 l-208 -121 -132 76 c-73 42
+-148 85 -167 96 -28 16 -222 127 -473 271 -18 11 -82 48 -142 83 l-111 64 1
+589 c0 324 2 591 5 594 3 2 145 84 315 182 171 98 378 217 461 265 83 48 157
+90 165 93 11 6 41 24 75 46 1 1 190 -108 420 -240z m-1788 -1533 c71 -41 138
+-80 149 -87 19 -11 20 -23 20 -186 l0 -174 -29 -15 c-15 -8 -28 -18 -28 -23 0
+-13 167 -174 235 -227 125 -97 270 -180 406 -235 74 -29 194 -67 233 -73 18
+-3 39 -8 47 -10 73 -26 352 -39 514 -24 95 8 261 43 354 74 163 55 413 195
+535 302 15 12 32 22 38 22 7 0 45 -19 85 -42 l74 -42 -23 -21 c-260 -239 -658
+-426 -983 -460 -27 -3 -63 -8 -79 -11 -32 -7 -285 -7 -361 0 -200 18 -437 87
+-633 184 -194 96 -315 185 -487 355 l-120 118 -38 -21 -38 -22 -137 78 c-75
+42 -144 83 -152 90 -12 10 -15 43 -14 178 0 99 4 170 10 176 8 8 283 168 291
+170 1 0 60 -33 131 -74z"/>
+<path d="M2475 4451 l-80 -47 -3 -84 c-3 -111 0 -122 46 -147 21 -11 59 -32
+83 -46 l44 -26 80 46 c44 25 83 51 87 56 3 6 6 53 5 106 l-2 94 -72 43 c-39
+23 -80 44 -90 47 -10 3 -51 -15 -98 -42z"/>
+<path d="M3978 1843 l-78 -45 0 -102 0 -102 83 -47 c46 -26 87 -47 92 -47 4 0
+44 21 89 47 l83 46 -1 101 -1 101 -80 47 c-44 27 -87 47 -95 47 -8 -1 -50 -22
+-92 -46z"/>
+<path d="M2307 3015 c-137 -80 -253 -145 -258 -145 -11 0 -10 21 -12 -318 -2
+-241 0 -285 13 -296 14 -11 435 -258 487 -285 20 -10 50 4 275 135 139 80 256
+151 260 157 3 6 6 142 6 303 l0 293 -132 77 c-72 42 -147 86 -166 96 -19 11
+-76 45 -127 74 -50 30 -93 54 -95 54 -1 -1 -115 -66 -251 -145z"/>
+<path d="M971 1846 c-40 -24 -76 -48 -80 -54 -5 -8 -6 -160 -2 -194 1 -8 156
+-98 169 -98 5 0 46 21 90 47 l81 47 3 70 c6 126 4 131 -60 168 -90 51 -104 58
+-116 58 -6 -1 -44 -20 -85 -44z"/>
 </g>
 </svg>
--- a/frontend/app-images/favicons/site.webmanifest
+++ b/frontend/app-images/favicons/site.webmanifest
@ -1,13 +1,14 @@
 {
    "name": "",
+    "short_name": "",
    "icons": [
        {
-            "src": "/images/favicon/android-chrome-192x192.png",
+            "src": "/images/favicons/android-chrome-192x192.png",
            "sizes": "192x192",
            "type": "image/png"
        },
        {
-            "src": "/images/favicon/android-chrome-512x512.png",
+            "src": "/images/favicons/android-chrome-512x512.png",
            "sizes": "512x512",
            "type": "image/png"
        }
@ -15,4 +16,4 @@
    "theme_color": "#ffffff",
    "background_color": "#ffffff",
    "display": "standalone"
-}
+}
--- a/frontend/app-images/logo-256.png
+++ b/frontend/app-images/logo-256.png
--- a/frontend/app-images/logo-text-vertical-grey.png
+++ b/frontend/app-images/logo-text-vertical-grey.png
--- a/frontend/html/partials/header.ejs
+++ b/frontend/html/partials/header.ejs
@ -5,22 +5,20 @@
 		<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
 		<meta http-equiv="X-UA-Compatible" content="ie=edge">
 		<meta http-equiv="Content-Language" content="en">
-		<meta name="msapplication-TileColor" content="#2d89ef">
-		<meta name="theme-color" content="#4188c9">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="mobile-web-app-capable" content="yes">
 		<meta name="HandheldFriendly" content="True">
 		<meta name="MobileOptimized" content="320">
 		<title><%- title %></title>
-		<link rel="apple-touch-icon" sizes="180x180" href="/images/favicons/apple-touch-icon.png?v=<%= version %>">
-		<link rel="icon" type="image/png" sizes="32x32" href="/images/favicons/favicon-32x32.png?v=<%= version %>">
-		<link rel="icon" type="image/png" sizes="16x16" href="/images/favicons/favicon-16x16.png?v=<%= version %>">
-		<link rel="manifest" href="/images/favicons/site.webmanifest?v=<%= version %>">
-		<link rel="mask-icon" href="/images/favicons/safari-pinned-tab.svg?v=<%= version %>" color="#5bbad5">
-		<link rel="shortcut icon" href="/images/favicons/favicon.ico?v=<%= version %>">
-		<meta name="msapplication-TileColor" content="#f5f5f5">
-		<meta name="msapplication-config" content="/images/favicons/browserconfig.xml?v=<%= version %>">
+		<link rel="apple-touch-icon" sizes="180x180" href="/images/favicons/apple-touch-icon.png">
+		<link rel="icon" type="image/png" sizes="32x32" href="/images/favicons/favicon-32x32.png">
+		<link rel="icon" type="image/png" sizes="16x16" href="/images/favicons/favicon-16x16.png">
+		<link rel="manifest" href="/images/favicons/site.webmanifest">
+		<link rel="mask-icon" href="/images/favicons/safari-pinned-tab.svg" color="#5bbad5">
+		<link rel="shortcut icon" href="/images/favicons/favicon.ico">
+		<meta name="msapplication-TileColor" content="#333333">
+		<meta name="msapplication-config" content="/images/favicons/browserconfig.xml">
 		<meta name="theme-color" content="#ffffff">
 		<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext">
 		<link href="/css/main.css?v=<%= version %>" rel="stylesheet">
--- a/frontend/js/app/user/form.ejs
+++ b/frontend/js/app/user/form.ejs
@ -14,8 +14,8 @@
                </div>
                <div class="col-sm-6 col-md-6">
                    <div class="form-group">
-                        <label class="form-label"><%- i18n('users', 'nickname') %></label>
-                        <input name="nickname" type="text" class="form-control" placeholder="Joe" value="<%- nickname %>">
+                        <label class="form-label"><%- i18n('users', 'nickname') %><span class="form-required">*</span> </label>
+                        <input name="nickname" type="text" class="form-control" placeholder="Joe" value="<%- nickname %>" required>
                    </div>
                </div>
                <div class="col-sm-12 col-md-12">
--- a/frontend/js/login/ui/login.ejs
+++ b/frontend/js/login/ui/login.ejs
@ -3,24 +3,35 @@
        <div class="col col-login mx-auto">
            <form class="card" action="" method="post">
                <div class="card-body p-6">
-                    <div class="card-title"><%- i18n('login', 'title') %></div>
-                    <div class="form-group">
-                        <label class="form-label"><%- i18n('str', 'email-address') %></label>
-                        <input name="identity" type="email" class="form-control" placeholder="<%- i18n('str', 'email-address') %>" required>
-                    </div>
-                    <div class="form-group">
-                        <label class="form-label"><%- i18n('str', 'password') %></label>
-                        <input name="secret" type="password" class="form-control" placeholder="<%- i18n('str', 'password') %>" required>
-                        <div class="invalid-feedback secret-error"></div>
-                    </div>
-                    <div class="form-footer">
-                        <button type="submit" class="btn btn-teal btn-block"><%- i18n('str', 'sign-in') %></button>
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-sm-12 col-md-6">
+                                <div class="text-center p-6">
+                                    <img src="/images/logo-text-vertical-grey.png" alt="Logo" />
+                                    <div class="text-center text-muted mt-5">
+                                        <%- i18n('main', 'version', {version: getVersion()}) %>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-12 col-md-6">
+                                <div class="card-title"><%- i18n('login', 'title') %></div>
+                                <div class="form-group">
+                                    <label class="form-label"><%- i18n('str', 'email-address') %></label>
+                                    <input name="identity" type="email" class="form-control" placeholder="<%- i18n('str', 'email-address') %>" required>
+                                </div>
+                                <div class="form-group">
+                                    <label class="form-label"><%- i18n('str', 'password') %></label>
+                                    <input name="secret" type="password" class="form-control" placeholder="<%- i18n('str', 'password') %>" required>
+                                    <div class="invalid-feedback secret-error"></div>
+                                </div>
+                                <div class="form-footer">
+                                    <button type="submit" class="btn btn-teal btn-block"><%- i18n('str', 'sign-in') %></button>
+                                </div>
+                            </div>
+                        </div>
                    </div>
                </div>
            </form>
-            <div class="text-center text-muted">
-                <%- i18n('main', 'app') %> <%- i18n('main', 'version', {version: getVersion()}) %>
-            </div>
        </div>
    </div>
 </div>
--- a/frontend/package.json
+++ b/frontend/package.json
@ -1,23 +1,23 @@
 {
  "name": "nginx-proxy-manager",
-  "version": "2.1.2",
+  "version": "0.0.0",
  "description": "A beautiful interface for creating Nginx endpoints",
  "main": "js/index.js",
  "devDependencies": {
-    "@babel/core": "^7.8.3",
+    "@babel/core": "^7.9.0",
    "babel-core": "^6.26.3",
-    "babel-loader": "^8.0.6",
+    "babel-loader": "^8.1.0",
    "babel-minify-webpack-plugin": "^0.3.1",
    "babel-preset-env": "^1.7.0",
    "backbone": "^1.4.0",
    "backbone.marionette": "^4.1.2",
    "copy-webpack-plugin": "^5.1.1",
-    "css-loader": "^3.4.2",
+    "css-loader": "^3.5.0",
    "ejs-lint": "^1.0.1",
-    "ejs-loader": "^0.3.5",
+    "ejs-loader": "^0.3.6",
    "ejs-webpack-loader": "^2.2.2",
-    "file-loader": "^5.0.2",
-    "html-webpack-plugin": "^3.2.0",
+    "file-loader": "^6.0.0",
+    "html-webpack-plugin": "^4.0.4",
    "imports-loader": "^0.8.0",
    "jquery": "^3.4.1",
    "jquery-mask-plugin": "^1.14.16",
@ -34,9 +34,9 @@
    "sass-loader": "^8.0.2",
    "style-loader": "^1.1.3",
    "tabler-ui": "git+https://github.com/tabler/tabler.git#00f78ad823311bc3ad974ac3e5b0126198f0a813",
-    "underscore": "^1.9.2",
-    "webpack": "^4.41.5",
-    "webpack-cli": "^3.3.10",
+    "underscore": "^1.10.2",
+    "webpack": "^4.42.1",
+    "webpack-cli": "^3.3.11",
    "webpack-visualizer-plugin": "^0.1.11"
  },
  "scripts": {
--- a/frontend/scss/custom.scss
+++ b/frontend/scss/custom.scss
@ -32,3 +32,7 @@ a:hover {
    display: flex;
    flex-wrap: wrap;
 }
+
+.col-login {
+    max-width: 48rem;
+}
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
--- a/scripts/docs-upload
+++ b/scripts/docs-upload
@ -0,0 +1,55 @@
+#!/bin/bash
+
+# Note: This script is designed to be run inside CI builds
+
+CYAN='\E[1;36m'
+YELLOW='\E[1;33m'
+BLUE='\E[1;34m'
+GREEN='\E[1;32m'
+RESET='\E[0m'
+
+echo -e "${BLUE}❯ ${CYAN}Uploading docs in: ${YELLOW}$1${RESET}"
+
+cd "$1" || exit 1
+ALL_FILES=$(find . -follow)
+
+for FILE in $ALL_FILES
+do
+	# remove preceeding ./
+	FILE=$(echo "$FILE" | sed -E "s/\.\///g")
+	echo '======================================='
+	echo "FILE: $FILE"
+
+	if [[ -d $FILE ]]; then
+		echo "Skipping $FILE because it's a directory"
+	elif [[ -f $FILE ]]; then
+		PARAM_STRING="--guess-mime-type"
+		EXT="${FILE##*.}"
+		if [ "$EXT" == "css" ]; then
+			PARAM_STRING="-mtext/css"
+		elif [ "$EXT" == "js" ]; then
+			PARAM_STRING="-mapplication/javascript"
+		elif [[ "$EXT" == "html" ]]; then
+			PARAM_STRING="-mtext/html"
+		elif [[ "$EXT" == "png" ]]; then
+			PARAM_STRING="-mimage/png"
+		elif [[ "$EXT" == "jpg" ]]; then
+			PARAM_STRING="-mimage/jpg"
+		elif [[ "$EXT" == "svg" ]]; then
+			PARAM_STRING="-mimage/svg+xml"
+		fi
+
+		DEST_FOLDER=$(dirname "$FILE")
+		if [ "$DEST_FOLDER" == "." ]; then
+			DEST_FOLDER=
+		else
+			DEST_FOLDER="${DEST_FOLDER}/"
+		fi
+
+		echo s3cmd -v -f -P "$PARAM_STRING" --add-header="Cache-Control:public,max-age=604800" sync "$FILE" "s3://$S3_BUCKET/$DEST_FOLDER"
+		s3cmd -v -f -P "$PARAM_STRING" --add-header="Cache-Control:public,max-age=604800" sync "$FILE" "s3://$S3_BUCKET/$DEST_FOLDER"
+		rc=$?; if [ $rc != 0 ]; then exit $rc; fi
+	fi
+done
+
+echo -e "${BLUE}❯ ${GREEN}Upload Complete${RESET}"
--- a/test/yarn.lock
+++ b/test/yarn.lock
Author	SHA1	Message	Date
jc21	9a7a216b23	Merge pull request #352 from jc21/develop Develop	2020-04-07 12:09:17 +10:00
jc21	fccaaaae4d	Merge branch 'master' into develop	2020-04-07 12:09:09 +10:00
Jamie Curnow	a882b0be82	Merge branch 'develop' of github.com:jc21/nginx-proxy-manager into develop	2020-04-07 12:06:55 +10:00
Jamie Curnow	db7bbab768	Updated npm deps	2020-04-07 12:06:36 +10:00
jc21	030e553549	Merge pull request #351 from jc21/develop v2.2.2 Release	2020-04-07 12:01:48 +10:00
jc21	8b0ca8e367	Merge branch 'master' into develop	2020-04-07 11:23:03 +10:00
Jamie Curnow	83b2b07200	Version bump	2020-04-07 10:45:45 +10:00
Jamie Curnow	bdb591af9e	- Add ability to disable ipv6, fixes #312 - Added ipv6 listening to hosts when configured, fixes #236 and #149 - Added documentation about disabling ipv6 - Updated npm packages	2020-04-07 10:43:19 +10:00
jc21	2993a08777	Merge pull request #349 from jc21/develop v2.2.1	2020-04-06 10:23:45 +10:00
Jamie Curnow	2a2d3d57ec	Version bump	2020-04-06 09:13:40 +10:00
jc21	33c2c131c2	Merge pull request #345 from IronTooch/master Documentation update	2020-04-06 08:33:02 +10:00
jc21	e4286c96a7	Merge pull request #342 from damianog/patch-1 Update proxy_host.conf	2020-04-06 08:32:48 +10:00
jc21	2d9486b6fd	Merge pull request #347 from jc21/dependabot/npm_and_yarn/test/acorn-7.1.1 Bump acorn from 7.1.0 to 7.1.1 in /test	2020-04-06 07:55:40 +10:00
jc21	632ee2d0bd	Merge pull request #348 from jc21/dependabot/npm_and_yarn/backend/acorn-7.1.1 Bump acorn from 7.1.0 to 7.1.1 in /backend	2020-04-06 07:36:16 +10:00
dependabot[bot]	b09f201819	Bump acorn from 7.1.0 to 7.1.1 in /backend Bumps [acorn](https://github.com/acornjs/acorn) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/7.1.0...7.1.1) Signed-off-by: dependabot[bot] <support@github.com>	2020-04-04 12:29:15 +00:00
dependabot[bot]	baaf39c23d	Bump acorn from 7.1.0 to 7.1.1 in /test Bumps [acorn](https://github.com/acornjs/acorn) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/7.1.0...7.1.1) Signed-off-by: dependabot[bot] <support@github.com>	2020-04-04 12:28:57 +00:00
IronTooch	b7467c10e8	Update README.md	2020-04-01 23:44:24 -04:00
IronTooch	701ef18606	Update README.md	2020-04-01 23:42:58 -04:00
Damiano	3e7d2b216b	Update proxy_host.conf FIX as explained on #340	2020-03-27 19:01:21 +01:00
dependabot[bot]	41f16c20b6	Bump minimist from 1.2.0 to 1.2.2 in /docs Bumps [minimist](https://github.com/substack/minimist) from 1.2.0 to 1.2.2. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.0...1.2.2) Signed-off-by: dependabot[bot] <support@github.com>	2020-03-19 09:53:16 +10:00
Jamie Curnow	96bc0b53c3	Manually applying #296 - nickname required in ui	2020-03-12 08:46:18 +10:00
jc21	b80baa78ef	Updated readme (#323 ) * Tweaks and backend vscode settings * Version bump * Updated Icon to be more vibrant * New logo and new login screen layout, version bump * New documentation! * Use CI to update package versions because I was sick of changing it everywhere * Generate docs * Docs upload * Fix pipeline * Fix pipeline * Update readme version before generating docs * Testing docs deploy * Fix pipeline * Updated CI link * Fix docs upload * Docs upload fixes * Fix s3 upload grrr * Docs tweaks * Updated readme * Updated screenshots * Updated cdn id for docs * Updated github image * Nicer readme header Co-authored-by: Jamie Curnow <jamiec@benon.com>	2020-03-12 08:43:50 +10:00
jc21	ce88e0745d	Updated cdn id for docs (#322 ) * Tweaks and backend vscode settings * Version bump * Updated Icon to be more vibrant * New logo and new login screen layout, version bump * New documentation! * Use CI to update package versions because I was sick of changing it everywhere * Generate docs * Docs upload * Fix pipeline * Fix pipeline * Update readme version before generating docs * Testing docs deploy * Fix pipeline * Updated CI link * Fix docs upload * Docs upload fixes * Fix s3 upload grrr * Docs tweaks * Updated readme * Updated screenshots * Updated cdn id for docs Co-authored-by: Jamie Curnow <jamiec@benon.com>	2020-03-12 08:36:01 +10:00
jc21	256bd2336f	v2.2.0 New Brand (#319 ) * Tweaks and backend vscode settings * Version bump * Updated Icon to be more vibrant * New logo and new login screen layout, version bump * New documentation! * Use CI to update package versions because I was sick of changing it everywhere * Generate docs * Docs upload * Fix pipeline * Fix pipeline * Update readme version before generating docs * Testing docs deploy * Fix pipeline * Updated CI link * Fix docs upload * Docs upload fixes * Fix s3 upload grrr * Docs tweaks * Updated readme * Updated screenshots Co-authored-by: Jamie Curnow <jamiec@benon.com>	2020-03-11 16:54:10 +10:00
Jamie Curnow	1b6993ee70	Added better Build Badge	2020-03-10 09:59:34 +10:00
 @ -1 +1 @@
 .1.2
 .2.2