Skip to content

[pull] develop from NginxProxyManager:develop #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 23, 2024
Merged

[pull] develop from NginxProxyManager:develop #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f537619
Revert "Change onRender function to always update the dashboard stats"
JohnJanzen-WI Dec 19, 2024
7f9240d
Add custom configuration to dead_host.conf
miguelangel-nubla Dec 19, 2024
3eecf7a
Add custom configuration to 404 hosts
miguelangel-nubla Dec 20, 2024
be5278f
Merge pull request #4247 from miguelangel-nubla/patch-1
jc21 Dec 23, 2024
f90d839
Merge pull request #4246 from JanzenJohn/develop
jc21 Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions backend/templates/dead_host.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,7 @@ server {
}
{% endif %}

# Custom
include /data/nginx/custom/server_dead[.]conf;
}
{% endif %}
1 change: 1 addition & 0 deletions docs/src/advanced-config/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 3 additions & 1 deletion frontend/js/app/dashboard/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -60,6 +61,7 @@ module.exports = Mn.View.extend({
.catch(err => {
console.log(err);
});
}
},

/**
Expand Down