From 2272373280958ae33be4d7b49b78f9c45432ef63 Mon Sep 17 00:00:00 2001
From: baudneo <86508179+baudneo@users.noreply.github.com>
Date: Mon, 10 Oct 2022 17:43:03 -0600
Subject: [PATCH] Small updates, merging into develop branch

---
 .../20220209144645_proxy_protocol.js          | 36 -------------------
 .../22021009153423_proxy_protocol.js          | 36 -------------------
 docker/Dockerfile                             |  5 +++
 docker/rootfs/etc/services.d/nginx/run        |  2 +-
 4 files changed, 6 insertions(+), 73 deletions(-)
 delete mode 100644 backend/migrations/20220209144645_proxy_protocol.js
 delete mode 100644 backend/migrations/22021009153423_proxy_protocol.js

diff --git a/backend/migrations/20220209144645_proxy_protocol.js b/backend/migrations/20220209144645_proxy_protocol.js
deleted file mode 100644
index bd32acab..00000000
--- a/backend/migrations/20220209144645_proxy_protocol.js
+++ /dev/null
@@ -1,36 +0,0 @@
-const migrate_name = 'proxy_protocol';
-const logger       = require('../logger').migrate;
-
-/**
- * Migrate
- *
- * @see http://knexjs.org/#Schema
- *
- * @param   {Object}  knex
- * @param   {Promise} Promise
- * @returns {Promise}
- */
-exports.up = function (knex/*, Promise*/) {
-    logger.info('[' + migrate_name + '] Migrating Up...');
-
-    return knex.schema.table('proxy_host', function (proxy_host) {
-        proxy_host.integer('enable_proxy_protocol').notNull().unsigned().defaultTo(0);
-        proxy_host.string('load_balancer_ip').notNull().defaultTo('');
-    })
-        .then(() => {
-            logger.info('[' + migrate_name + '] proxy_host Table altered');
-        });
-
-};
-
-/**
- * Undo Migrate
- *
- * @param   {Object}  knex
- * @param   {Promise} Promise
- * @returns {Promise}
- */
-exports.down = function (knex, Promise) {
-    logger.warn('[' + migrate_name + '] You can\'t migrate down this one.');
-    return Promise.resolve(true);
-};
diff --git a/backend/migrations/22021009153423_proxy_protocol.js b/backend/migrations/22021009153423_proxy_protocol.js
deleted file mode 100644
index bd32acab..00000000
--- a/backend/migrations/22021009153423_proxy_protocol.js
+++ /dev/null
@@ -1,36 +0,0 @@
-const migrate_name = 'proxy_protocol';
-const logger       = require('../logger').migrate;
-
-/**
- * Migrate
- *
- * @see http://knexjs.org/#Schema
- *
- * @param   {Object}  knex
- * @param   {Promise} Promise
- * @returns {Promise}
- */
-exports.up = function (knex/*, Promise*/) {
-    logger.info('[' + migrate_name + '] Migrating Up...');
-
-    return knex.schema.table('proxy_host', function (proxy_host) {
-        proxy_host.integer('enable_proxy_protocol').notNull().unsigned().defaultTo(0);
-        proxy_host.string('load_balancer_ip').notNull().defaultTo('');
-    })
-        .then(() => {
-            logger.info('[' + migrate_name + '] proxy_host Table altered');
-        });
-
-};
-
-/**
- * Undo Migrate
- *
- * @param   {Object}  knex
- * @param   {Promise} Promise
- * @returns {Promise}
- */
-exports.down = function (knex, Promise) {
-    logger.warn('[' + migrate_name + '] You can\'t migrate down this one.');
-    return Promise.resolve(true);
-};
diff --git a/docker/Dockerfile b/docker/Dockerfile
index acb59359..58bad95d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -58,6 +58,11 @@ RUN rm -rf /etc/services.d/frontend /etc/nginx/conf.d/dev.conf
 # Change permission of logrotate config file
 RUN chmod 644 /etc/logrotate.d/nginx-proxy-manager
 
+# fix for pip installs
+# https://github.com/NginxProxyManager/nginx-proxy-manager/issues/1769
+RUN pip uninstall --yes setuptools \
+	&& pip install "setuptools==58.0.0"
+
 VOLUME [ "/data", "/etc/letsencrypt" ]
 ENTRYPOINT [ "/init" ]
 
diff --git a/docker/rootfs/etc/services.d/nginx/run b/docker/rootfs/etc/services.d/nginx/run
index 508b7d73..51ca5ea1 100755
--- a/docker/rootfs/etc/services.d/nginx/run
+++ b/docker/rootfs/etc/services.d/nginx/run
@@ -24,7 +24,7 @@ chown root /tmp/nginx
 
 # Dynamically generate resolvers file, if resolver is IPv6, enclose in `[]`
 # thanks @tfmm
-echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" { sub(/%.*$/,"",$2); print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" > /etc/nginx/conf.d/include/resolvers.conf
+echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" { sub(/%.*$/,"",$2); print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf) valid=10s;" > /etc/nginx/conf.d/include/resolvers.conf
 
 # Generate dummy self-signed certificate.
 if [ ! -f /data/nginx/dummycert.pem ] || [ ! -f /data/nginx/dummykey.pem ]