serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-03-22 19:43:44 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions3

remove .source from the module ID

Browse source 
Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>
This commit is contained in:
Mohammed Al Sahaf 2025-03-21 02:28:36 +03:00
parent 6eab324bb5
commit 64118c3491
No known key found for this signature in database
5 changed files with 6 additions and 6 deletions
modules.go
modules
caddyhttp/reverseproxy
caddyfile.gohttptransport.go
caddytls
acmeissuer.go
internal/network
networkproxy.go

2
modules.go
View file

@ -364,7 +364,7 @@ func isModuleMapType(typ reflect.Type) bool {
// ProxyFuncProducer is implemented by modules which produce a
// function that returns a URL to use as network proxy. Modules
// in the namespace `caddy.network_proxy.source` must implement this
// in the namespace `caddy.network_proxy` must implement this
// interface.
type ProxyFuncProducer interface {
ProxyFunc() func(*http.Request) (*url.URL, error)

2
modules/caddyhttp/reverseproxy/caddyfile.go
View file

@ -1086,7 +1086,7 @@ func (h *HTTPTransport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
return d.ArgErr()
}
modStem := d.Val()
modID := "caddy.network_proxy.source." + modStem
modID := "caddy.network_proxy." + modStem
unm, err := caddyfile.UnmarshalModule(d, modID)
if err != nil {
return err

2
modules/caddyhttp/reverseproxy/httptransport.go
View file

@ -157,7 +157,7 @@ type HTTPTransport struct {
//
// If nil, defaults to reading the `HTTP_PROXY`,
// `HTTPS_PROXY`, and `NO_PROXY` environment variables.
NetworkProxyRaw json.RawMessage `json:"network_proxy,omitempty" caddy:"namespace=caddy.network_proxy.source inline_key=from"`
NetworkProxyRaw json.RawMessage `json:"network_proxy,omitempty" caddy:"namespace=caddy.network_proxy inline_key=from"`
h2cTransport *http2.Transport
h3Transport *http3.Transport // TODO: EXPERIMENTAL (May 2024)

2
modules/caddytls/acmeissuer.go
View file

@ -107,7 +107,7 @@ type ACMEIssuer struct {
CertificateLifetime caddy.Duration `json:"certificate_lifetime,omitempty"`
// Forward proxy module
NetworkProxyRaw json.RawMessage `json:"network_proxy,omitempty" caddy:"namespace=caddy.network_proxy.source inline_key=from"`
NetworkProxyRaw json.RawMessage `json:"network_proxy,omitempty" caddy:"namespace=caddy.network_proxy inline_key=from"`
rootPool *x509.CertPool
logger *zap.Logger

4
modules/internal/network/networkproxy.go
View file

@ -28,7 +28,7 @@ type ProxyFromURL struct {
// CaddyModule implements Module.
func (p ProxyFromURL) CaddyModule() caddy.ModuleInfo {
return caddy.ModuleInfo{
ID: "caddy.network_proxy.source.url",
ID: "caddy.network_proxy.url",
New: func() caddy.Module {
return &ProxyFromURL{}
},
@ -114,7 +114,7 @@ type ProxyFromNone struct{}
func (p ProxyFromNone) CaddyModule() caddy.ModuleInfo {
return caddy.ModuleInfo{
ID: "caddy.network_proxy.source.none",
ID: "caddy.network_proxy.none",
New: func() caddy.Module {
return &ProxyFromNone{}
},