mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2026-11-07 00:05:14 +00:00
Kadxy
37170ae81a
Installs that enabled ngx_brotli before v2.3.0 have no http.d include in nginx.conf, because the include is only inserted when a module is toggled or built. The settings page reported this as "cannot write the managed configuration" and skipped the brotli save, so the save path that inserts the include was never reached, even on a stock nginx.conf. The settings response now tells the two cases apart with an in-memory insertion check that writes nothing: - include missing but insertable, or managed file missing: managedPending, the page explains the values take effect after saving and saves normally - no safe insertion point: managedUnavailable, unchanged The save path now inserts the include through ensureNginxHTTPIncludeActive, the same function module activation uses, so both produce identical results. A sentinel error keeps "no insertion point" mapped to ErrBrotliUnsupported while I/O failures are still returned as-is.
112 lines
3.7 KiB
Go
112 lines
3.7 KiB
Go
package response
|
|
|
|
import "github.com/1Panel-dev/1Panel/agent/app/dto"
|
|
|
|
type NginxStatus struct {
|
|
Active int `json:"active"`
|
|
Accepts int `json:"accepts"`
|
|
Handled int `json:"handled"`
|
|
Requests int `json:"requests"`
|
|
Reading int `json:"reading"`
|
|
Writing int `json:"writing"`
|
|
Waiting int `json:"waiting"`
|
|
}
|
|
|
|
type NginxParam struct {
|
|
Name string `json:"name"`
|
|
Params []string `json:"params"`
|
|
}
|
|
|
|
// NginxBrotliRes carries the brotli settings together with where they live.
|
|
// ManagedExternally is true when the user defined brotli by hand, in which
|
|
// case the panel only reports the values and must not write its own copy.
|
|
// ManagedPending is true when nginx does not load the managed configuration
|
|
// yet but saving will wire it in, so the reported values are not in effect
|
|
// until then.
|
|
// ManagedUnavailable is true when the panel cannot wire the managed
|
|
// configuration into nginx.conf at all, so the reported values are inert.
|
|
type NginxBrotliRes struct {
|
|
Params []NginxParam `json:"params"`
|
|
ManagedExternally bool `json:"managedExternally"`
|
|
ManagedPending bool `json:"managedPending"`
|
|
ManagedUnavailable bool `json:"managedUnavailable"`
|
|
}
|
|
|
|
type NginxAuthRes struct {
|
|
Enable bool `json:"enable"`
|
|
Items []dto.NginxAuth `json:"items"`
|
|
}
|
|
|
|
type NginxPathAuthRes struct {
|
|
dto.NginxPathAuth
|
|
}
|
|
|
|
type NginxAntiLeechRes struct {
|
|
Enable bool `json:"enable"`
|
|
Extends string `json:"extends"`
|
|
Return string `json:"return"`
|
|
ServerNames []string `json:"serverNames"`
|
|
Cache bool `json:"cache"`
|
|
CacheTime int `json:"cacheTime"`
|
|
CacheUint string `json:"cacheUint"`
|
|
NoneRef bool `json:"noneRef"`
|
|
LogEnable bool `json:"logEnable"`
|
|
Blocked bool `json:"blocked"`
|
|
}
|
|
|
|
type NginxRedirectConfig struct {
|
|
WebsiteID uint `json:"websiteID"`
|
|
Name string `json:"name"`
|
|
Domains []string `json:"domains"`
|
|
KeepPath bool `json:"keepPath"`
|
|
Enable bool `json:"enable"`
|
|
Type string `json:"type"`
|
|
Redirect string `json:"redirect"`
|
|
Path string `json:"path"`
|
|
Target string `json:"target"`
|
|
FilePath string `json:"filePath"`
|
|
Content string `json:"content"`
|
|
RedirectRoot bool `json:"redirectRoot"`
|
|
}
|
|
|
|
type NginxFile struct {
|
|
Content string `json:"content"`
|
|
}
|
|
|
|
type NginxProxyCache struct {
|
|
Open bool `json:"open"`
|
|
CacheLimit float64 `json:"cacheLimit"`
|
|
CacheLimitUnit string `json:"cacheLimitUnit" `
|
|
ShareCache int `json:"shareCache" `
|
|
ShareCacheUnit string `json:"shareCacheUnit" `
|
|
CacheExpire int `json:"cacheExpire" `
|
|
CacheExpireUnit string `json:"cacheExpireUnit" `
|
|
}
|
|
|
|
type NginxModule struct {
|
|
Name string `json:"name"`
|
|
Custom bool `json:"custom"`
|
|
Script string `json:"script"`
|
|
Packages string `json:"packages"`
|
|
Params string `json:"params"`
|
|
Enable bool `json:"enable"`
|
|
BuildMode string `json:"buildMode"`
|
|
Provider string `json:"provider"`
|
|
LoadOrder int `json:"loadOrder"`
|
|
BuildStatus string `json:"buildStatus"`
|
|
LoadStatus string `json:"loadStatus"`
|
|
Artifacts []dto.NginxModuleArtifact `json:"artifacts"`
|
|
LastError string `json:"lastError"`
|
|
}
|
|
|
|
type NginxBuildConfig struct {
|
|
Mirror string `json:"mirror"`
|
|
DynamicSupported bool `json:"dynamicSupported"`
|
|
Modules []NginxModule `json:"modules"`
|
|
}
|
|
|
|
type NginxConfigRes struct {
|
|
Https bool `json:"https"`
|
|
SSLRejectHandshake bool `json:"sslRejectHandshake"`
|
|
}
|