chore: migrate from mholt/certmagic to tmpim/certmagic (#5)

* chore: migrate from mholt/certmagic to tmpim/certmagic * chore: use latest version
tmpim · Oct 1, 2020 · 6b226ee · 6b226ee
1 parent 8cd7bab
commit 6b226ee
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 65 deletions.
diff --git a/casket/casketmain/run.go b/casket/casketmain/run.go
@@ -31,11 +31,11 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/klauspost/cpuid"
-	"github.com/mholt/certmagic"
 	"github.com/tmpim/casket"
 	"github.com/tmpim/casket/casketfile"
 	"github.com/tmpim/casket/caskettls"
 	"github.com/tmpim/casket/telemetry"
+	"github.com/tmpim/certmagic"
 	lumberjack "gopkg.in/natefinch/lumberjack.v2"
 
 	_ "github.com/tmpim/casket/caskethttp" // plug in the HTTP server type

diff --git a/caskethttp/httpserver/https.go b/caskethttp/httpserver/https.go
@@ -20,7 +20,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/mholt/certmagic"
+	"github.com/tmpim/certmagic"
 	"github.com/tmpim/casket"
 	"github.com/tmpim/casket/caskettls"
 )

diff --git a/caskethttp/httpserver/https_test.go b/caskethttp/httpserver/https_test.go
@@ -23,7 +23,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/mholt/certmagic"
+	"github.com/tmpim/certmagic"
 	"github.com/tmpim/casket/caskettls"
 )
 

diff --git a/caskethttp/httpserver/plugin.go b/caskethttp/httpserver/plugin.go
@@ -27,12 +27,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mholt/certmagic"
 	"github.com/tmpim/casket"
 	"github.com/tmpim/casket/casketfile"
 	"github.com/tmpim/casket/caskethttp/staticfiles"
 	"github.com/tmpim/casket/caskettls"
 	"github.com/tmpim/casket/telemetry"
+	"github.com/tmpim/certmagic"
 )
 
 const serverType = "http"

diff --git a/caskethttp/httpserver/tplcontext.go b/caskethttp/httpserver/tplcontext.go
@@ -33,7 +33,7 @@ import (
 
 	"os"
 
-	"github.com/mholt/certmagic"
+	"github.com/tmpim/certmagic"
 	"github.com/russross/blackfriday"
 	"github.com/tmpim/casket/caskettls"
 )

diff --git a/caskettls/config.go b/caskettls/config.go
@@ -24,8 +24,8 @@ import (
 	"github.com/go-acme/lego/v3/certcrypto"
 	"github.com/go-acme/lego/v3/challenge/tlsalpn01"
 	"github.com/klauspost/cpuid"
-	"github.com/mholt/certmagic"
 	"github.com/tmpim/casket"
+	"github.com/tmpim/certmagic"
 )
 
 // Config describes how TLS should be configured and used.

diff --git a/caskettls/handshake.go b/caskettls/handshake.go
@@ -21,7 +21,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/mholt/certmagic"
+	"github.com/tmpim/certmagic"
 	"github.com/tmpim/casket/telemetry"
 )
 

diff --git a/caskettls/setup.go b/caskettls/setup.go
@@ -29,9 +29,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mholt/certmagic"
 	"github.com/tmpim/casket"
 	"github.com/tmpim/casket/telemetry"
+	"github.com/tmpim/certmagic"
 )
 
 func init() {

diff --git a/caskettls/setup_test.go b/caskettls/setup_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 
 	"github.com/go-acme/lego/v3/certcrypto"
-	"github.com/mholt/certmagic"
+	"github.com/tmpim/certmagic"
 	"github.com/tmpim/casket"
 )
 

diff --git a/caskettls/tls.go b/caskettls/tls.go
@@ -30,7 +30,7 @@ package caskettls
 
 import (
 	"github.com/go-acme/lego/v3/challenge"
-	"github.com/mholt/certmagic"
+	"github.com/tmpim/certmagic"
 	"github.com/tmpim/casket"
 )
 

diff --git a/caskettls/tls_test.go b/caskettls/tls_test.go
@@ -17,7 +17,7 @@ package caskettls
 import (
 	"testing"
 
-	"github.com/mholt/certmagic"
+	"github.com/tmpim/certmagic"
 )
 
 type holder struct {

diff --git a/go.mod b/go.mod
@@ -3,24 +3,25 @@ module github.com/tmpim/casket
 go 1.13
 
 require (
+	github.com/bitly/go-hostpool v0.1.0 // indirect
+	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
 	github.com/dustin/go-humanize v1.0.0
 	github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568
 	github.com/go-acme/lego/v3 v3.3.0
 	github.com/google/uuid v1.1.1
 	github.com/gorilla/websocket v1.4.0
 	github.com/hashicorp/go-syslog v1.0.0
 	github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a
-	github.com/klauspost/cpuid v1.2.0
-	github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 // indirect
+	github.com/klauspost/cpuid v1.2.5
 	github.com/lucas-clemente/quic-go v0.13.1
-	github.com/mholt/certmagic v0.8.3
-	github.com/naoina/go-stringutil v0.1.0 // indirect
+	github.com/tmpim/certmagic v0.12.2
+	github.com/miekg/dns v1.1.30 // indirect
 	github.com/naoina/toml v0.1.1
 	github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4
 	github.com/tmpim/casket-plugins v0.0.0-20200626073009-9f63e7c3a8cb
 	github.com/tmpim/dnsproviders v0.4.1-0.20200426010140-ffa99ed51cb7
-	golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a
-	golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect
+	golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect
+	golang.org/x/net v0.0.0-20200707034311-ab3426394381
 	gopkg.in/mcuadros/go-syslog.v2 v2.2.1
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v2 v2.2.2

diff --git a/go.sum b/go.sum