Merge pull request #349 from jc21/develop

v2.2.1
Version bump
2020-04-06 10:23:45 +10:00 · 2020-04-06 09:13:40 +10:00 · 2020-04-06 08:33:02 +10:00 · 2020-04-06 08:32:48 +10:00 · 2020-04-06 07:55:40 +10:00 · 2020-04-06 07:36:16 +10:00
7 changed files with 425 additions and 287 deletions
--- a/.version
+++ b/.version
@ -1 +1 @@
-2.2.0
+2.2.1
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 <p align="center">
  <img src="https://nginxproxymanager.com/github.png">
  <br><br>
-  <img src="https://img.shields.io/badge/version-2.2.0-green.svg?style=for-the-badge">
+  <img src="https://img.shields.io/badge/version-2.2.1-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/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/yarn.lock
+++ b/backend/yarn.lock
@ -37,9 +37,9 @@ acorn-jsx@^5.1.0:
  integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==

 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==
+  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"
--- a/docs/setup/README.md
+++ b/docs/setup/README.md
@ -6,7 +6,7 @@

 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:

@ -88,6 +88,7 @@ Then:
 docker-compose up -d
 ```

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

 ### Running on Raspberry PI / ARM devices

--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@ -4928,9 +4928,9 @@ minimist@0.0.8:
  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=
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz#b00a00230a1108c48c169e69a291aafda3aacd63"
+  integrity sha512-rIqbOrKb8GJmx/5bc2M0QchhUouMXSpd1RTclXsB41JdL+VtnojfaJR+h7F9k18/4kHUsBFgk80Uk+q569vjPA==

 mississippi@^3.0.0:
  version "3.0.0"
--- a/test/yarn.lock
+++ b/test/yarn.lock
Author	SHA1	Message	Date
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
 @ -1 +1 @@
 .2.0
 .2.1