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

Use upstream in host config

Browse Source
This commit is contained in:
Jamie Curnow
2023-01-06 11:42:02 +10:00
parent bc6825c148
commit 17a108f75f
6 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,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 {
@ -119,7 +119,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 {
@ -140,6 +140,12 @@ func (m *Model) Expand(items []string) error {
m.NginxTemplate = &templ
}
if util.SliceContainsItem(items, "upstream") && m.UpstreamID > 0 {
var ups upstream.Model
ups, err = upstream.GetByID(m.UpstreamID)
m.Upstream = ups
}
return err
}
@ -171,6 +177,7 @@ func (m *Model) GetTemplate() Template {
Status: m.Status,
ErrorMessage: m.ErrorMessage,
IsDisabled: m.IsDisabled,
Upstream: m.Upstream,
}
return t