Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6c3a577

Browse files
committed
Use certmagic, simplify config, set HTTP timeouts and a modern TLSConfig
1 parentc5a9a5b commit6c3a577

File tree

171 files changed

+30697
-4908
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+30697
-4908
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ The libraries this project is built with.
9898
-[Bleve](https://github.com/blevesearch/bleve)
9999
-[Cobra](https://github.com/spf13/cobra)
100100
-[Viper](https://github.com/spf13/viper)
101-
-[Lego](https://github.com/xenolf/lego)
101+
-[CertMagic](https://github.com/mholt/certmagic)
102102

103103
###Client
104104

‎config.default.toml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,19 @@ readonly = false
2222
show_details =false
2323

2424
[https]
25-
enabled =false
25+
enabled =true
2626
port =443
27-
# Redirect all http traffic to https
28-
redirect =true
2927
# Path to your cert and private key if you are not using
3028
# the Let's Encrypt integration
3129
cert =""
3230
key =""
3331

3432
[letsencrypt]
35-
# Your domain or subdomain
33+
# Your domain or subdomain, if not set a certificate will be
34+
# fetched for whatever domain dispatch gets accessed through
3635
domain =""
3736
# An email address lets you recover your accounts private key
3837
email =""
39-
# The port Let's Encrypt listens on, comment this out to let it bind
40-
# to port 80 as needed, doing so means dispatch itself cannot use port 80
41-
port =5001
42-
# Have dispatch proxy traffic from port 80 to the Let's Encrypt port
43-
proxy =true
4438

4539
# Not implemented
4640
[auth]

‎config/config.go‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@ type Defaults struct {
3131
}
3232

3333
typeHTTPSstruct {
34-
Enabledbool
35-
Portstring
36-
Redirectbool
37-
Certstring
38-
Keystring
39-
HSTS*HSTS
34+
Enabledbool
35+
Portstring
36+
Certstring
37+
Keystring
38+
HSTS*HSTS
4039
}
4140

4241
typeHSTSstruct {
@@ -49,8 +48,6 @@ type HSTS struct {
4948
typeLetsEncryptstruct {
5049
Domainstring
5150
Emailstring
52-
Portstring
53-
Proxybool
5451
}
5552

5653
funcLoadConfig() (*Config,chan*Config) {

‎go.mod‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/cznic/mathutilv0.0.0-20181122101859-297441e03548// indirect
1414
github.com/cznic/strutilv0.0.0-20181122101858-275e90344537// indirect
1515
github.com/dsnet/compressv0.0.0-20171208185109-cc9eb1d7ad76
16-
github.com/edsrzf/mmap-gov0.0.0-20170320065105-0bce6a688712// indirect
16+
github.com/edsrzf/mmap-gov1.0.0// indirect
1717
github.com/facebookgo/ensurev0.0.0-20160127193407-b4ab57deab51// indirect
1818
github.com/facebookgo/stackv0.0.0-20160209184415-751773369052// indirect
1919
github.com/facebookgo/subsetv0.0.0-20150612182917-8dac2c3c4870// indirect
@@ -28,9 +28,11 @@ require (
2828
github.com/jpillora/backoffv0.0.0-20180909062703-3050d21c67d7
2929
github.com/jtolds/glsv4.2.1+incompatible// indirect
3030
github.com/kjk/betterguidv0.0.0-20170621091430-c442874ba63a
31+
github.com/klauspost/cpuidv1.2.0
3132
github.com/kr/prettyv0.1.0// indirect
3233
github.com/mailru/easyjsonv0.0.0-20180823135443-60711f1a8329
33-
github.com/miekg/dnsv1.0.15// indirect
34+
github.com/mholt/certmagicv0.0.0-20181214183619-fd326512c10c
35+
github.com/miekg/dnsv1.1.1// indirect
3436
github.com/mitchellh/go-homedirv1.0.0
3537
github.com/mschoch/smatv0.0.0-20160514031455-90eadee771ae// indirect
3638
github.com/onsi/ginkgov1.7.0// indirect
@@ -41,17 +43,17 @@ require (
4143
github.com/smartystreets/goconveyv0.0.0-20181108003508-044398e4856c// indirect
4244
github.com/spf13/castv1.3.0
4345
github.com/spf13/cobrav0.0.3
44-
github.com/spf13/viperv1.3.0
46+
github.com/spf13/viperv1.3.1
4547
github.com/steveyen/gtreapv0.0.0-20150807155958-0abe01ef9be2// indirect
4648
github.com/stretchr/testifyv1.2.2
4749
github.com/syndtr/goleveldbv0.0.0-20181128100959-b001fa50d6b2// indirect
4850
github.com/tecbot/gorocksdbv0.0.0-20181010114359-8752a9433481// indirect
49-
github.com/tinylib/msgpv0.0.0-20180215042507-3b5c87ab5fb0// indirect
51+
github.com/tinylib/msgpv1.1.0// indirect
5052
github.com/willf/bitsetv1.1.9// indirect
51-
github.com/xenolf/legov1.2.1
52-
golang.org/x/netv0.0.0-20181201002055-351d144fa1fc
53+
github.com/xenolf/legov1.2.2-0.20181211001449-b05b54d1f69a
54+
golang.org/x/netv0.0.0-20181213202711-891ebc4b82d6
5355
golang.org/x/syncv0.0.0-20181108010431-42b317875d0f// indirect
54-
golang.org/x/sysv0.0.0-20181206074257-70b957f3b65e// indirect
56+
golang.org/x/sysv0.0.0-20181213200352-4d1cda033e06// indirect
5557
gopkg.in/check.v1v1.0.0-20180628173108-788fd7840127// indirect
5658
gopkg.in/square/go-jose.v2v2.2.1// indirect
5759
)

‎go.sum‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
2828
github.com/davecgh/go-spewv1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2929
github.com/dsnet/compressv0.0.0-20171208185109-cc9eb1d7ad76 h1:eX+pdPPlD279OWgdx7f6KqIRSONuK7egk+jDx7OM3Ac=
3030
github.com/dsnet/compressv0.0.0-20171208185109-cc9eb1d7ad76/go.mod h1:KjxHHirfLaw19iGT70HvVjHQsL1vq1SRQB4yOsAfy2s=
31-
github.com/edsrzf/mmap-gov0.0.0-20170320065105-0bce6a688712 h1:aaQcKT9WumO6JEJcRyTqFVq4XUZiUcKR2/GI31TOcz8=
32-
github.com/edsrzf/mmap-gov0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
31+
github.com/edsrzf/mmap-gov1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
32+
github.com/edsrzf/mmap-gov1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
3333
github.com/facebookgo/ensurev0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ=
3434
github.com/facebookgo/ensurev0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64=
3535
github.com/facebookgo/stackv0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A=
@@ -64,6 +64,8 @@ github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpR
6464
github.com/jtolds/glsv4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
6565
github.com/kjk/betterguidv0.0.0-20170621091430-c442874ba63a h1:b+Gt8sQs//Sl5Dcem5zP9Qc2FgEUAygREa2AAa2Vmcw=
6666
github.com/kjk/betterguidv0.0.0-20170621091430-c442874ba63a/go.mod h1:uxRAhHE1nl34DpWgfe0CYbNYbCnYplaB6rZH9ReWtUk=
67+
github.com/klauspost/cpuidv1.2.0 h1:NMpwD2G9JSFOE1/TJjGSo5zG7Yb2bTe7eq1jH+irmeE=
68+
github.com/klauspost/cpuidv1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
6769
github.com/kr/prettyv0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
6870
github.com/kr/prettyv0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
6971
github.com/kr/ptyv1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -73,8 +75,10 @@ github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDe
7375
github.com/magiconair/propertiesv1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
7476
github.com/mailru/easyjsonv0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic=
7577
github.com/mailru/easyjsonv0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
76-
github.com/miekg/dnsv1.0.15 h1:9+UupePBQCG6zf1q/bGmTO1vumoG13jsrbWOSX1W6Tw=
77-
github.com/miekg/dnsv1.0.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
78+
github.com/mholt/certmagicv0.0.0-20181214183619-fd326512c10c h1:WBDm4CVARtUhxBQZa6g/llfZtO7Sf1qMkCWCxqpXNvI=
79+
github.com/mholt/certmagicv0.0.0-20181214183619-fd326512c10c/go.mod h1:09k100NW9m2nUn/lUB5JmCG1iFw0nEZ4HT0bdhDn9ns=
80+
github.com/miekg/dnsv1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o=
81+
github.com/miekg/dnsv1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
7882
github.com/mitchellh/go-homedirv1.0.0 h1:vKb8ShqSby24Yrqr/yDYkuFz8d0WUjys40rvnGC8aR0=
7983
github.com/mitchellh/go-homedirv1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
8084
github.com/mitchellh/mapstructurev1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
@@ -109,8 +113,8 @@ github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9
109113
github.com/spf13/jwalterweathermanv1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
110114
github.com/spf13/pflagv1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
111115
github.com/spf13/pflagv1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
112-
github.com/spf13/viperv1.3.0 h1:cO6QlTTeK9RQDhFAbGLV5e3fHXbRpin/Gi8qfL4rdLk=
113-
github.com/spf13/viperv1.3.0/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
116+
github.com/spf13/viperv1.3.1 h1:5+8j8FTpnFV4nEImW/ofkzEt8VoOiLXxdYIDsB73T38=
117+
github.com/spf13/viperv1.3.1/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
114118
github.com/steveyen/gtreapv0.0.0-20150807155958-0abe01ef9be2 h1:JNEGSiWg6D3lcBCMCBqN3ELniXujt+0QNHLhNnO0w3s=
115119
github.com/steveyen/gtreapv0.0.0-20150807155958-0abe01ef9be2/go.mod h1:mjqs7N0Q6m5HpR7QfXVBZXZWSqTjQLeTujjA/xUp2uw=
116120
github.com/stretchr/testifyv1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
@@ -119,27 +123,27 @@ github.com/syndtr/goleveldb v0.0.0-20181128100959-b001fa50d6b2 h1:GnOzE5fEFN3b2z
119123
github.com/syndtr/goleveldbv0.0.0-20181128100959-b001fa50d6b2/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
120124
github.com/tecbot/gorocksdbv0.0.0-20181010114359-8752a9433481 h1:HOxvxvnntLiPn123Fk+twfUhCQdMDaqmb0cclArW0T0=
121125
github.com/tecbot/gorocksdbv0.0.0-20181010114359-8752a9433481/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8=
122-
github.com/tinylib/msgpv0.0.0-20180215042507-3b5c87ab5fb0 h1:uAwzi+JwkDdOtQZVqPYljFvJr7i43ZgUYXKypk9Eibk=
123-
github.com/tinylib/msgpv0.0.0-20180215042507-3b5c87ab5fb0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
126+
github.com/tinylib/msgpv1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU=
127+
github.com/tinylib/msgpv1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
124128
github.com/ugorji/go/codecv0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
125129
github.com/willf/bitsetv1.1.9 h1:GBtFynGY9ZWZmEC9sWuu41/7VBXPFCOAbCbqTflOg9c=
126130
github.com/willf/bitsetv1.1.9/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
127-
github.com/xenolf/legov1.2.1 h1:wAsBCIaTDlgYbR/yVuP0gzcnZrA94NVc84K6vfOIyyA=
128-
github.com/xenolf/legov1.2.1/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
131+
github.com/xenolf/legov1.2.2-0.20181211001449-b05b54d1f69a h1:LxrSGLCB2RdWyjzWYaN22GFOUAlUjWCIwLE96kbN/PE=
132+
github.com/xenolf/legov1.2.2-0.20181211001449-b05b54d1f69a/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
129133
github.com/xordataexchange/cryptv0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
130134
golang.org/x/cryptov0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0=
131135
golang.org/x/cryptov0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
132136
golang.org/x/netv0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
133-
golang.org/x/netv0.0.0-20181201002055-351d144fa1fc h1:a3CU5tJYVj92DY2LaA1kUkrsqD5/3mLDhx2NcNqyW+0=
134-
golang.org/x/netv0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
137+
golang.org/x/netv0.0.0-20181213202711-891ebc4b82d6 h1:gT0Y6H7hbVPUtvtk0YGxMXPgN+p8fYlqWkgJeUCZcaQ=
138+
golang.org/x/netv0.0.0-20181213202711-891ebc4b82d6/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
135139
golang.org/x/syncv0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
136140
golang.org/x/syncv0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
137141
golang.org/x/syncv0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
138142
golang.org/x/syncv0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
139143
golang.org/x/sysv0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
140144
golang.org/x/sysv0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
141-
golang.org/x/sysv0.0.0-20181206074257-70b957f3b65e h1:njOxP/wVblhCLIUhjHXf6X+dzTt5OQ3vMQo9mkOIKIo=
142-
golang.org/x/sysv0.0.0-20181206074257-70b957f3b65e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
145+
golang.org/x/sysv0.0.0-20181213200352-4d1cda033e06 h1:0oC8rFnE+74kEmuHZ46F6KHsMr5Gx2gUQPuNz28iQZM=
146+
golang.org/x/sysv0.0.0-20181213200352-4d1cda033e06/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
143147
golang.org/x/textv0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
144148
golang.org/x/textv0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
145149
gopkg.in/check.v1v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

‎pkg/letsencrypt/directory.go‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp