Skip to content

Commit 75dbbeb

Browse files
authored
Merge branch 'NginxProxyManager:develop' into develop
2 parents f6abe27 + f90d839 commit 75dbbeb

File tree

6 files changed

+18
-4
lines changed

6 files changed

+18
-4
lines changed

backend/templates/dead_host.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,7 @@ server {
2222
}
2323
{% endif %}
2424

25+
# Custom
26+
include /data/nginx/custom/server_dead[.]conf;
2527
}
2628
{% endif %}

docs/src/advanced-config/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ You can add your custom configuration snippet files at `/data/nginx/custom` as f
181181
- `/data/nginx/custom/server_stream.conf`: Included at the end of every stream server block
182182
- `/data/nginx/custom/server_stream_tcp.conf`: Included at the end of every TCP stream server block
183183
- `/data/nginx/custom/server_stream_udp.conf`: Included at the end of every UDP stream server block
184+
- `/data/nginx/custom/server_dead.conf`: Included at the end of every 404 server block
184185

185186
Every file is optional.
186187

docs/src/third-party/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Known integrations:
1212
- [HomeAssistant Hass.io plugin](https://github.com/hassio-addons/addon-nginx-proxy-manager)
1313
- [UnRaid / Synology](https://github.com/jlesage/docker-nginx-proxy-manager)
1414
- [Proxmox Scripts](https://github.com/ej52/proxmox-scripts/tree/main/apps/nginx-proxy-manager)
15+
- [Proxmox VE Helper-Scripts](https://community-scripts.github.io/ProxmoxVE/scripts?id=nginxproxymanager)
1516
- [nginxproxymanagerGraf](https://github.com/ma-karai/nginxproxymanagerGraf)
1617

1718

docs/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -873,9 +873,9 @@ mitt@^3.0.1:
873873
integrity sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==
874874

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

880880
881881
version "0.4.3"

frontend/js/app/dashboard/main.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ module.exports = Mn.View.extend({
5050
onRender: function () {
5151
let view = this;
5252

53-
Api.Reports.getHostStats()
53+
if (typeof view.stats.hosts === 'undefined') {
54+
Api.Reports.getHostStats()
5455
.then(response => {
5556
if (!view.isDestroyed()) {
5657
view.stats.hosts = response;
@@ -60,6 +61,7 @@ module.exports = Mn.View.extend({
6061
.catch(err => {
6162
console.log(err);
6263
});
64+
}
6365
},
6466

6567
/**

global/certbot-dns-plugins.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,14 @@
247247
"credentials": "dns_hetzner_api_token = 0123456789abcdef0123456789abcdef",
248248
"full_plugin_name": "dns-hetzner"
249249
},
250+
"hostingnl": {
251+
"name": "Hosting.nl",
252+
"package_name": "certbot-dns-hostingnl",
253+
"version": "~=0.1.5",
254+
"dependencies": "",
255+
"credentials": "dns_hostingnl_api_key = 0123456789abcdef0123456789abcdef",
256+
"full_plugin_name": "dns-hostingnl"
257+
},
250258
"hover": {
251259
"name": "Hover",
252260
"package_name": "certbot-dns-hover",

0 commit comments

Comments
 (0)