bastion/nginx-proxy-manager
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better host upstream support

Browse Source
This commit is contained in:
Jamie Curnow
2023-01-09 13:18:11 +10:00
parent 0a50672ab6
commit ca4d92d793
6 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/internal/entity/host/model.go
View File

@ -58,7 +58,7 @@ type Model struct {
Certificate *certificate.Model `json:"certificate,omitempty"`
NginxTemplate *nginxtemplate.Model `json:"nginx_template,omitempty"`
User *user.Model `json:"user,omitempty"`
Upstream upstream.Model `json:"upstream,omitempty"`
Upstream *upstream.Model `json:"upstream,omitempty"`
}
func (m *Model) getByQuery(query string, params []interface{}) error {
@ -122,7 +122,7 @@ func (m *Model) Expand(items []string) error {
if m.UpstreamID > 0 {
var u upstream.Model
u, err = upstream.GetByID(m.UpstreamID)
m.Upstream = u
m.Upstream = &u
}
if util.SliceContainsItem(items, "user") && m.ID > 0 {
@ -146,7 +146,7 @@ func (m *Model) Expand(items []string) error {
if util.SliceContainsItem(items, "upstream") && m.UpstreamID > 0 {
var ups upstream.Model
ups, err = upstream.GetByID(m.UpstreamID)
m.Upstream = ups
m.Upstream = &ups
}
return err
@ -163,6 +163,9 @@ func (m *Model) GetTemplate() Template {
UserID: m.UserID,
Type: m.Type,
NginxTemplateID: m.NginxTemplateID,
ProxyScheme: m.ProxyScheme,
ProxyHost: m.ProxyHost,
ProxyPort: m.ProxyPort,
ListenInterface: m.ListenInterface,
DomainNames: domainNames,
UpstreamID: m.UpstreamID,
@ -180,7 +183,6 @@ func (m *Model) GetTemplate() Template {
Status: m.Status,
ErrorMessage: m.ErrorMessage,
IsDisabled: m.IsDisabled,
Upstream: m.Upstream,
}
return t