ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-07-04 17:06:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

- Added upstream objects

Browse Source 
- Renamed host templates to nginx templates
- Generate upstream templates
- Better nginx error reporting when reloading
- Use tparse for golang test reporting
This commit is contained in:
Jamie Curnow
2023-01-04 15:36:56 +10:00
parent b3ae2f4dbb
commit 5e5f0de0e2
82 changed files with 2209 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/internal/validator/hosts.go
View File

@ -5,7 +5,7 @@ import (
"npm/internal/entity/certificate"
"npm/internal/entity/host"
"npm/internal/entity/hosttemplate"
"npm/internal/entity/nginxtemplate"
)
// ValidateHost will check if associated objects exist and other checks
@ -20,13 +20,13 @@ func ValidateHost(h host.Model) error {
}
}
// Check the host template exists and has the same type.
hostTemplate, tErr := hosttemplate.GetByID(h.HostTemplateID)
// Check the nginx template exists and has the same type.
nginxTemplate, tErr := nginxtemplate.GetByID(h.NginxTemplateID)
if tErr != nil {
return fmt.Errorf("Host Template #%d does not exist", h.HostTemplateID)
return fmt.Errorf("Host Template #%d does not exist", h.NginxTemplateID)
}
if hostTemplate.Type != h.Type {
return fmt.Errorf("Host Template #%d is not valid for this host type", h.HostTemplateID)
if nginxTemplate.Type != h.Type {
return fmt.Errorf("Host Template #%d is not valid for this host type", h.NginxTemplateID)
}
return nil