diff --git a/.gitignore b/.gitignore index ca937f6..fcb744d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,9 @@ .env.* certs acme.d +xversion.go +/mplexer/cmd/telebit/telebit /telebit /cmd/telebit/telebit /telebitd @@ -14,3 +16,5 @@ acme.d .*.sw* log.txt *.log +.DS_Store +*.exe diff --git a/go.mod b/go.mod index f006dda..e0cf9d1 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module git.coolaj86.com/coolaj86/go-telebitd go 1.14 require ( + git.rootprojects.org/root/go-gitver v1.1.3 github.com/caddyserver/certmagic v0.10.12 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/go-acme/lego/v3 v3.7.0 diff --git a/go.sum b/go.sum index ea4d15f..ade5cec 100644 --- a/go.sum +++ b/go.sum @@ -22,6 +22,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +git.rootprojects.org/root/go-gitver v1.1.3 h1:/qR9z53vY+IFhWRxLkF9cjaiWh8xRJIm6gyuW+MG81A= +git.rootprojects.org/root/go-gitver v1.1.3/go.mod h1:Rj1v3TBhvdaSphFEqMynUYwAz/4f+wY/+syBTvRrmlI= github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-autorest/autorest v0.1.0/go.mod h1:AKyIcETwSUFxIcs/Wnq/C+kwCtlEYGUVd7FPNb2slmg= github.com/Azure/go-autorest/autorest v0.5.0/go.mod h1:9HLKlQjVBH6U3oDfsXOeVc56THsLPw1L03yban4xThw= diff --git a/mplexer/telebit.go b/mplexer/telebit.go index 369872d..375bda9 100644 --- a/mplexer/telebit.go +++ b/mplexer/telebit.go @@ -188,7 +188,7 @@ func TerminateTLS(client net.Conn, acme *ACME) net.Conn { tlsConfig := &tls.Config{ GetCertificate: func(hello *tls.ClientHelloInfo) (*tls.Certificate, error) { - return magic.GetCertificate(hello) + return acmecert.GetCertificate(hello) /* if false { _, _ = magic.GetCertificate(hello) diff --git a/tools/tools.go b/tools/tools.go index c4508fa..f41c4b5 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -2,3 +2,5 @@ // tools is a faux package for tracking dependencies that don't make it into the code package tools + +import _ "git.rootprojects.org/root/go-gitver" diff --git a/vendor/modules.txt b/vendor/modules.txt index a2b9176..1837729 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,3 +1,7 @@ +# git.rootprojects.org/root/go-gitver v1.1.3 +## explicit +git.rootprojects.org/root/go-gitver +git.rootprojects.org/root/go-gitver/gitver # github.com/caddyserver/certmagic v0.10.12 ## explicit github.com/caddyserver/certmagic