Merge pull request #19 from whalehub/master

Update the import paths for Caddy

Author: pieterlouw

README.md

@@ -1,6 +1,6 @@
 # Caddy Net #
 
-TCP/UDP server type for [Caddy Server](https://github.com/mholt/caddy)
+TCP/UDP server type for [Caddy Server](https://github.com/caddyserver/caddy)
 
 The server type is called `net`
 
@@ -49,7 +49,7 @@ This server type leverage the [tls directive](https://caddyserver.com/docs/tls)
 
 ## References ##
 
-[Writing a Plugin: Server Type](https://github.com/mholt/caddy/wiki/Writing-a-Plugin:-Server-Type)
+[Writing a Plugin: Server Type](https://github.com/caddyserver/caddy/wiki/Writing-a-Plugin:-Server-Type)
 
 [Caddy Forum discussion](https://caddy.community/t/writing-a-tcp-udp-server-type-for-caddy/1589)
 

caddynet/host/host.go

@@ -1,8 +1,8 @@
 package host
 
 import (
-	"github.com/mholt/caddy"
-	"github.com/mholt/caddy/caddytls"
+	"github.com/caddyserver/caddy"
+	"github.com/caddyserver/caddy/caddytls"
 	"github.com/pieterlouw/caddy-net/caddynet/netserver"
 )
 

caddynet/netserver/config.go

@@ -1,6 +1,6 @@
 package netserver
 
-import "github.com/mholt/caddy/caddytls"
+import "github.com/caddyserver/caddy/caddytls"
 
 // Config contains configuration details about a net server type
 type Config struct {

caddynet/netserver/echoserver.go

@@ -6,8 +6,8 @@ import (
 	"io"
 	"net"
 
-	"github.com/mholt/caddy"
-	"github.com/mholt/caddy/caddytls"
+	"github.com/caddyserver/caddy"
+	"github.com/caddyserver/caddy/caddytls"
 )
 
 // EchoServer is an echo implementation of the

caddynet/netserver/plugin.go

@@ -5,9 +5,9 @@ import (
 	"log"
 	"strings"
 
-	"github.com/mholt/caddy"
-	"github.com/mholt/caddy/caddyfile"
-	"github.com/mholt/caddy/caddytls"
+	"github.com/caddyserver/caddy"
+	"github.com/caddyserver/caddy/caddyfile"
+	"github.com/caddyserver/caddy/caddytls"
 )
 
 const serverType = "net"

caddynet/netserver/proxyserver.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/mholt/caddy"
-	"github.com/mholt/caddy/caddytls"
+	"github.com/caddyserver/caddy"
+	"github.com/caddyserver/caddy/caddytls"
 )
 
 // ProxyServer is an implementation of the

caddynet/netserver/tls.go

@@ -3,16 +3,16 @@ package netserver
 import (
 	"fmt"
 
-	"github.com/mholt/caddy"
-	"github.com/mholt/caddy/caddytls"
+	"github.com/caddyserver/caddy"
+	"github.com/caddyserver/caddy/caddytls"
 	"github.com/mholt/certmagic"
 )
 
 // activateTLS
 func activateTLS(cctx caddy.Context) error {
 	operatorPresent := !caddy.Started()
 
-	// Follow steps stipulated in https://github.com/mholt/caddy/wiki/Writing-a-Plugin:-Server-Type#automatic-tls (indicated below by numbered comments)
+	// Follow steps stipulated in https://github.com/caddyserver/caddy/wiki/Writing-a-Plugin:-Server-Type#automatic-tls (indicated below by numbered comments)
 
 	// 1. Prints a message to stdout, "Activating privacy features..." (if the operator is present; i.e. caddy.Started() == false) because the process can take a few seconds
 	if !caddy.Quiet && operatorPresent {