diff options
Diffstat (limited to 'clients')
-rw-r--r-- | clients/autocert/autocert_wrapper.go | 11 | ||||
-rw-r--r-- | clients/autocert/go.mod | 10 | ||||
-rw-r--r-- | clients/autocert/go.sum | 14 |
3 files changed, 17 insertions, 18 deletions
diff --git a/clients/autocert/autocert_wrapper.go b/clients/autocert/autocert_wrapper.go index c8dd180..b174a62 100644 --- a/clients/autocert/autocert_wrapper.go +++ b/clients/autocert/autocert_wrapper.go | |||
@@ -7,10 +7,9 @@ import ( | |||
7 | 7 | ||
8 | "code.crute.us/mcrute/golib/clients/dns" | 8 | "code.crute.us/mcrute/golib/clients/dns" |
9 | glautocert "code.crute.us/mcrute/golib/crypto/acme/autocert" | 9 | glautocert "code.crute.us/mcrute/golib/crypto/acme/autocert" |
10 | fautocert "code.crute.us/mcrute/golib/crypto/acme/autocert/fork" | ||
10 | "code.crute.us/mcrute/golib/log" | 11 | "code.crute.us/mcrute/golib/log" |
11 | "code.crute.us/mcrute/golib/service" | 12 | "code.crute.us/mcrute/golib/service" |
12 | |||
13 | "golang.org/x/crypto/acme/autocert" | ||
14 | ) | 13 | ) |
15 | 14 | ||
16 | type AutocertConfig struct { | 15 | type AutocertConfig struct { |
@@ -21,7 +20,7 @@ type AutocertConfig struct { | |||
21 | } | 20 | } |
22 | 21 | ||
23 | type AutocertWrapper struct { | 22 | type AutocertWrapper struct { |
24 | *autocert.Manager | 23 | *fautocert.Manager |
25 | hostList *glautocert.ACMEHostList | 24 | hostList *glautocert.ACMEHostList |
26 | primingNotify chan string | 25 | primingNotify chan string |
27 | primaryHost string | 26 | primaryHost string |
@@ -41,9 +40,9 @@ func NewAutocertWrapper(ctx context.Context, c AutocertConfig) (*AutocertWrapper | |||
41 | hostList: hostList, | 40 | hostList: hostList, |
42 | primingNotify: make(chan string, 10), | 41 | primingNotify: make(chan string, 10), |
43 | primaryHost: c.Hosts[0], | 42 | primaryHost: c.Hosts[0], |
44 | Manager: &autocert.Manager{ | 43 | Manager: &fautocert.Manager{ |
45 | Cache: autocert.DirCache("ssl/"), | 44 | Cache: fautocert.DirCache("ssl/"), |
46 | Prompt: autocert.AcceptTOS, | 45 | Prompt: fautocert.AcceptTOS, |
47 | HostPolicy: hostList.HostPolicy, | 46 | HostPolicy: hostList.HostPolicy, |
48 | Email: c.Email, | 47 | Email: c.Email, |
49 | StapleOCSP: true, | 48 | StapleOCSP: true, |
diff --git a/clients/autocert/go.mod b/clients/autocert/go.mod index 0783e75..d09f564 100644 --- a/clients/autocert/go.mod +++ b/clients/autocert/go.mod | |||
@@ -2,15 +2,13 @@ module code.crute.us/mcrute/golib/clients/autocert/v2 | |||
2 | 2 | ||
3 | go 1.18 | 3 | go 1.18 |
4 | 4 | ||
5 | replace golang.org/x/crypto => ../../../third_party/golang/x/crypto | ||
6 | |||
7 | require ( | 5 | require ( |
8 | code.crute.us/mcrute/golib v0.4.2 | 6 | code.crute.us/mcrute/golib v0.6.0 |
9 | code.crute.us/mcrute/golib/clients/dns v0.1.0 | 7 | code.crute.us/mcrute/golib/clients/dns v0.1.0 |
10 | golang.org/x/crypto v0.3.0 | ||
11 | ) | 8 | ) |
12 | 9 | ||
13 | require ( | 10 | require ( |
14 | golang.org/x/net v0.2.0 // indirect | 11 | golang.org/x/crypto v0.11.0 // indirect |
15 | golang.org/x/text v0.4.0 // indirect | 12 | golang.org/x/net v0.10.0 // indirect |
13 | golang.org/x/text v0.11.0 // indirect | ||
16 | ) | 14 | ) |
diff --git a/clients/autocert/go.sum b/clients/autocert/go.sum index b6bb4ff..8eeb498 100644 --- a/clients/autocert/go.sum +++ b/clients/autocert/go.sum | |||
@@ -1,8 +1,10 @@ | |||
1 | code.crute.us/mcrute/golib v0.4.2 h1:WeZyBMRFOiIkdNhsXx3kMgRGDUdUshzHS/J4OIPThlY= | 1 | code.crute.us/mcrute/golib v0.6.0 h1:36+rTs5Z7lKjXpsgKhyKsOl9S2pHRcxK+D9ytbbTqGw= |
2 | code.crute.us/mcrute/golib v0.4.2/go.mod h1:dukLPhs1H8dxtkhXtpJZYo/bMzefLRbdRj9Tj67wdaQ= | 2 | code.crute.us/mcrute/golib v0.6.0/go.mod h1:nB/ZeOhlFWUwGj5jTPJxYVyqDLdO3U9ZvBiH+Kll87s= |
3 | code.crute.us/mcrute/golib/clients/dns v0.1.0 h1:bgB+KVLcuSfr5ZoAEgLToawtP4iIrxWIf3s7mMgOo6U= | 3 | code.crute.us/mcrute/golib/clients/dns v0.1.0 h1:bgB+KVLcuSfr5ZoAEgLToawtP4iIrxWIf3s7mMgOo6U= |
4 | code.crute.us/mcrute/golib/clients/dns v0.1.0/go.mod h1:uF2fDvCZAL35ZJgojUhCgVK0HBmIv1+go1NMNPSJaeU= | 4 | code.crute.us/mcrute/golib/clients/dns v0.1.0/go.mod h1:uF2fDvCZAL35ZJgojUhCgVK0HBmIv1+go1NMNPSJaeU= |
5 | golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= | 5 | golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= |
6 | golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= | 6 | golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= |
7 | golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= | 7 | golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= |
8 | golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= | 8 | golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= |
9 | golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= | ||
10 | golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= | ||