diff --git a/modules.go b/modules.go index 5c601efe4..37b56a988 100644 --- a/modules.go +++ b/modules.go @@ -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) diff --git a/modules/caddyhttp/reverseproxy/caddyfile.go b/modules/caddyhttp/reverseproxy/caddyfile.go index d4ed43310..d0947197a 100644 --- a/modules/caddyhttp/reverseproxy/caddyfile.go +++ b/modules/caddyhttp/reverseproxy/caddyfile.go @@ -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 diff --git a/modules/caddyhttp/reverseproxy/httptransport.go b/modules/caddyhttp/reverseproxy/httptransport.go index 6e88be500..92fe9ab7c 100644 --- a/modules/caddyhttp/reverseproxy/httptransport.go +++ b/modules/caddyhttp/reverseproxy/httptransport.go @@ -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) diff --git a/modules/caddytls/acmeissuer.go b/modules/caddytls/acmeissuer.go index 234ed973e..bf2ebeacc 100644 --- a/modules/caddytls/acmeissuer.go +++ b/modules/caddytls/acmeissuer.go @@ -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 diff --git a/modules/internal/network/networkproxy.go b/modules/internal/network/networkproxy.go index 44d8d5cc6..f9deeb43a 100644 --- a/modules/internal/network/networkproxy.go +++ b/modules/internal/network/networkproxy.go @@ -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{} },