diff options
Diffstat (limited to 'modules/caddyhttp/reverseproxy')
| -rw-r--r-- | modules/caddyhttp/reverseproxy/caddyfile.go | 3 | ||||
| -rw-r--r-- | modules/caddyhttp/reverseproxy/command.go | 8 | ||||
| -rw-r--r-- | modules/caddyhttp/reverseproxy/fastcgi/fastcgi.go | 6 | ||||
| -rw-r--r-- | modules/caddyhttp/reverseproxy/healthchecks.go | 3 | ||||
| -rw-r--r-- | modules/caddyhttp/reverseproxy/httptransport.go | 7 | ||||
| -rw-r--r-- | modules/caddyhttp/reverseproxy/reverseproxy.go | 5 | ||||
| -rw-r--r-- | modules/caddyhttp/reverseproxy/upstreams.go | 3 | 
7 files changed, 21 insertions, 14 deletions
| diff --git a/modules/caddyhttp/reverseproxy/caddyfile.go b/modules/caddyhttp/reverseproxy/caddyfile.go index 774f889..a986f89 100644 --- a/modules/caddyhttp/reverseproxy/caddyfile.go +++ b/modules/caddyhttp/reverseproxy/caddyfile.go @@ -21,6 +21,8 @@ import (  	"strconv"  	"strings" +	"github.com/dustin/go-humanize" +  	"github.com/caddyserver/caddy/v2"  	"github.com/caddyserver/caddy/v2/caddyconfig"  	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" @@ -28,7 +30,6 @@ import (  	"github.com/caddyserver/caddy/v2/modules/caddyhttp"  	"github.com/caddyserver/caddy/v2/modules/caddyhttp/headers"  	"github.com/caddyserver/caddy/v2/modules/caddyhttp/rewrite" -	"github.com/dustin/go-humanize"  )  func init() { diff --git a/modules/caddyhttp/reverseproxy/command.go b/modules/caddyhttp/reverseproxy/command.go index 9359f3d..11f935c 100644 --- a/modules/caddyhttp/reverseproxy/command.go +++ b/modules/caddyhttp/reverseproxy/command.go @@ -21,15 +21,17 @@ import (  	"strconv"  	"strings" +	"github.com/spf13/cobra" +	"go.uber.org/zap" + +	caddycmd "github.com/caddyserver/caddy/v2/cmd" +  	"github.com/caddyserver/caddy/v2"  	"github.com/caddyserver/caddy/v2/caddyconfig"  	"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" -	caddycmd "github.com/caddyserver/caddy/v2/cmd"  	"github.com/caddyserver/caddy/v2/modules/caddyhttp"  	"github.com/caddyserver/caddy/v2/modules/caddyhttp/headers"  	"github.com/caddyserver/caddy/v2/modules/caddytls" -	"github.com/spf13/cobra" -	"go.uber.org/zap"  )  func init() { diff --git a/modules/caddyhttp/reverseproxy/fastcgi/fastcgi.go b/modules/caddyhttp/reverseproxy/fastcgi/fastcgi.go index f150edc..31febdd 100644 --- a/modules/caddyhttp/reverseproxy/fastcgi/fastcgi.go +++ b/modules/caddyhttp/reverseproxy/fastcgi/fastcgi.go @@ -24,13 +24,13 @@ import (  	"strings"  	"time" -	"github.com/caddyserver/caddy/v2/modules/caddyhttp" -	"github.com/caddyserver/caddy/v2/modules/caddyhttp/reverseproxy" -	"github.com/caddyserver/caddy/v2/modules/caddytls"  	"go.uber.org/zap"  	"go.uber.org/zap/zapcore"  	"github.com/caddyserver/caddy/v2" +	"github.com/caddyserver/caddy/v2/modules/caddyhttp" +	"github.com/caddyserver/caddy/v2/modules/caddyhttp/reverseproxy" +	"github.com/caddyserver/caddy/v2/modules/caddytls"  )  var noopLogger = zap.NewNop() diff --git a/modules/caddyhttp/reverseproxy/healthchecks.go b/modules/caddyhttp/reverseproxy/healthchecks.go index 80b635a..1b4f2d0 100644 --- a/modules/caddyhttp/reverseproxy/healthchecks.go +++ b/modules/caddyhttp/reverseproxy/healthchecks.go @@ -26,9 +26,10 @@ import (  	"strconv"  	"time" +	"go.uber.org/zap" +  	"github.com/caddyserver/caddy/v2"  	"github.com/caddyserver/caddy/v2/modules/caddyhttp" -	"go.uber.org/zap"  )  // HealthChecks configures active and passive health checks. diff --git a/modules/caddyhttp/reverseproxy/httptransport.go b/modules/caddyhttp/reverseproxy/httptransport.go index 8334f25..bcce67b 100644 --- a/modules/caddyhttp/reverseproxy/httptransport.go +++ b/modules/caddyhttp/reverseproxy/httptransport.go @@ -28,12 +28,13 @@ import (  	"strings"  	"time" -	"github.com/caddyserver/caddy/v2" -	"github.com/caddyserver/caddy/v2/modules/caddyhttp" -	"github.com/caddyserver/caddy/v2/modules/caddytls"  	"github.com/mastercactapus/proxyprotocol"  	"go.uber.org/zap"  	"golang.org/x/net/http2" + +	"github.com/caddyserver/caddy/v2" +	"github.com/caddyserver/caddy/v2/modules/caddyhttp" +	"github.com/caddyserver/caddy/v2/modules/caddytls"  )  func init() { diff --git a/modules/caddyhttp/reverseproxy/reverseproxy.go b/modules/caddyhttp/reverseproxy/reverseproxy.go index b65dce7..249326d 100644 --- a/modules/caddyhttp/reverseproxy/reverseproxy.go +++ b/modules/caddyhttp/reverseproxy/reverseproxy.go @@ -32,14 +32,15 @@ import (  	"sync"  	"time" +	"go.uber.org/zap" +	"golang.org/x/net/http/httpguts" +  	"github.com/caddyserver/caddy/v2"  	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"  	"github.com/caddyserver/caddy/v2/modules/caddyevents"  	"github.com/caddyserver/caddy/v2/modules/caddyhttp"  	"github.com/caddyserver/caddy/v2/modules/caddyhttp/headers"  	"github.com/caddyserver/caddy/v2/modules/caddyhttp/rewrite" -	"go.uber.org/zap" -	"golang.org/x/net/http/httpguts"  )  func init() { diff --git a/modules/caddyhttp/reverseproxy/upstreams.go b/modules/caddyhttp/reverseproxy/upstreams.go index 19e4f3c..8bdc60d 100644 --- a/modules/caddyhttp/reverseproxy/upstreams.go +++ b/modules/caddyhttp/reverseproxy/upstreams.go @@ -11,8 +11,9 @@ import (  	"sync"  	"time" -	"github.com/caddyserver/caddy/v2"  	"go.uber.org/zap" + +	"github.com/caddyserver/caddy/v2"  )  func init() { | 
