Merge branch 'NginxProxyManager:develop' into develop

Merge pull request #4246 from JanzenJohn/develop
Remove infinite requests loop
2025-05-07 22:42:29 +00:00 · 2024-12-23 19:18:09 -05:00 · 2024-12-24 08:16:48 +10:00 · 2024-12-24 08:15:55 +10:00 · 2024-12-20 01:03:21 +01:00 · 2024-12-20 00:59:26 +01:00
6 changed files with 18 additions and 4 deletions
--- a/backend/templates/dead_host.conf
+++ b/backend/templates/dead_host.conf
@ -22,5 +22,7 @@ server {
  }
 {% endif %}

+  # Custom
+  include /data/nginx/custom/server_dead[.]conf;
 }
 {% endif %}
--- a/docs/src/advanced-config/index.md
+++ b/docs/src/advanced-config/index.md
@ -181,6 +181,7 @@ You can add your custom configuration snippet files at `/data/nginx/custom` as f
 - `/data/nginx/custom/server_stream.conf`: Included at the end of every stream server block
 - `/data/nginx/custom/server_stream_tcp.conf`: Included at the end of every TCP stream server block
 - `/data/nginx/custom/server_stream_udp.conf`: Included at the end of every UDP stream server block
+ - `/data/nginx/custom/server_dead.conf`: Included at the end of every 404 server block

 Every file is optional.

--- a/docs/src/third-party/index.md
+++ b/docs/src/third-party/index.md
@ -12,6 +12,7 @@ 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)
 - [Proxmox Scripts](https://github.com/ej52/proxmox-scripts/tree/main/apps/nginx-proxy-manager)
+- [Proxmox VE Helper-Scripts](https://community-scripts.github.io/ProxmoxVE/scripts?id=nginxproxymanager)
 - [nginxproxymanagerGraf](https://github.com/ma-karai/nginxproxymanagerGraf)


--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@ -873,9 +873,9 @@ mitt@^3.0.1:
  integrity sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==

 nanoid@^3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==

 oniguruma-to-js@0.4.3:
  version "0.4.3"
--- a/frontend/js/app/dashboard/main.js
+++ b/frontend/js/app/dashboard/main.js
@ -50,7 +50,8 @@ module.exports = Mn.View.extend({
    onRender: function () {
        let view = this;

-        Api.Reports.getHostStats()
+        if (typeof view.stats.hosts === 'undefined') {
+            Api.Reports.getHostStats()
                .then(response => {
                    if (!view.isDestroyed()) {
                        view.stats.hosts = response;
@ -60,6 +61,7 @@ module.exports = Mn.View.extend({
                .catch(err => {
                    console.log(err);
                });
+        }
    },

    /**
--- a/global/certbot-dns-plugins.json
+++ b/global/certbot-dns-plugins.json
@ -247,6 +247,14 @@
 		"credentials": "dns_hetzner_api_token = 0123456789abcdef0123456789abcdef",
 		"full_plugin_name": "dns-hetzner"
 	},
+	"hostingnl": {
+		"name": "Hosting.nl",
+		"package_name": "certbot-dns-hostingnl",
+		"version": "~=0.1.5",
+		"dependencies": "",
+		"credentials": "dns_hostingnl_api_key = 0123456789abcdef0123456789abcdef",
+		"full_plugin_name": "dns-hostingnl"
+	},
 	"hover": {
 		"name": "Hover",
 		"package_name": "certbot-dns-hover",
Author	SHA1	Message	Date
Sergey Kolesnik	75dbbebf8d	Merge branch 'NginxProxyManager:develop' into develop	2024-12-23 19:18:09 -05:00
jc21	f90d839ebe	Merge pull request #4246 from JanzenJohn/develop Remove infinite requests loop	2024-12-24 08:16:48 +10:00
jc21	be5278f31e	Merge pull request #4247 from miguelangel-nubla/patch-1 Add custom configuration to 404 hosts	2024-12-24 08:15:55 +10:00
Miguel Angel Nubla	3eecf7a38b	Add custom configuration to 404 hosts	2024-12-20 01:03:21 +01:00
Miguel Angel Nubla	7f9240dda7	Add custom configuration to dead_host.conf	2024-12-20 00:59:26 +01:00
John Janzen	f537619ffe	Revert "Change onRender function to always update the dashboard stats" This reverts commit d26e8c1d0c44a5fbeb1264f8fe713bdac0f5e703. This reopens #4204 (which i can't reproduce sadly) The reverted commit is responsible for an infinite loop of requests to /hosts, which makes buttons unresponsive on the main page another way to invalidate the cache needs to be found this infinite requests loop happens on d26e8c1d0c44a5fbeb1264f8fe713bdac0f5e703 and on the docker image `nginxproxymanager/nginx-proxy-manager-dev:pr-4206` the docker image is attaced to the pr #4206 which merges the commit	2024-12-19 16:16:03 +01:00
jc21	805968aac6	Merge pull request #4185 from muescha/patch-1 All checks were successful Close stale issues and PRs / stale (push) Successful in 4s Details Update index.md: add link to Proxmox VE Helper-Scripts	2024-12-17 07:59:45 +10:00
jc21	2a4093c1b8	Merge pull request #4215 from TECH7Fox/patch-1 Add hostingnl DNS Challenge provider	2024-12-17 07:57:43 +10:00
jc21	ae2ac8a733	Merge pull request #4230 from NginxProxyManager/dependabot/npm_and_yarn/docs/nanoid-3.3.8 Bump nanoid from 3.3.7 to 3.3.8 in /docs	2024-12-17 07:52:24 +10:00
dependabot[bot]	c6eca2578e	Bump nanoid from 3.3.7 to 3.3.8 in /docs Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-14 10:02:55 +00:00
Jordy Kuhne	56033bee9c	Add hostingnl	2024-12-08 15:23:37 +01:00
Muescha	151160a834	Update index.md: add link to Proxmox VE Helper-Scripts Update index.md: add link to Proxmox VE Helper-Scripts	2024-11-24 20:10:17 +01:00