Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Anti-censorship
Pluggable Transports
Snowflake
Commits
b0826304
Commit
b0826304
authored
Jan 21, 2017
by
David Fifield
Browse files
Make certManager a pointer and only set it when !disableTLS.
parent
138d2b53
Changes
1
Hide whitespace changes
Inline
Side-by-side
server/server.go
View file @
b0826304
...
...
@@ -250,13 +250,14 @@ func main() {
log
.
Fatalf
(
"error in setup: %s"
,
err
)
}
var
certManager
*
autocert
.
Manager
if
!
disableTLS
{
log
.
Printf
(
"ACME hostnames: %q"
,
acmeHostnames
)
}
certManager
:=
autocert
.
Manager
{
Prompt
:
autocert
.
AcceptTOS
,
HostPolicy
:
autocert
.
HostWhitelist
(
acmeHostnames
...
)
,
Email
:
acmeEmail
,
certManager
=
&
autocert
.
Manager
{
Prompt
:
autocert
.
AcceptTOS
,
HostPolicy
:
autocert
.
HostWhitelist
(
acmeHostnames
...
)
,
Email
:
acmeEmail
,
}
}
// The ACME responder only works when it is running on port 443. In case
...
...
@@ -284,7 +285,7 @@ func main() {
addr
:=
*
bindaddr
.
Addr
addr
.
Port
=
443
log
.
Printf
(
"opening additional ACME listener on %s"
,
addr
.
String
())
ln443
,
err
:=
startListenerTLS
(
"tcp"
,
&
addr
,
&
certManager
)
ln443
,
err
:=
startListenerTLS
(
"tcp"
,
&
addr
,
certManager
)
if
err
!=
nil
{
log
.
Printf
(
"error opening ACME listener: %s"
,
err
)
pt
.
SmethodError
(
bindaddr
.
MethodName
,
"ACME listener: "
+
err
.
Error
())
...
...
@@ -304,7 +305,7 @@ func main() {
for
_
,
hostname
:=
range
acmeHostnames
{
args
.
Add
(
"hostname"
,
hostname
)
}
ln
,
err
=
startListenerTLS
(
"tcp"
,
bindaddr
.
Addr
,
&
certManager
)
ln
,
err
=
startListenerTLS
(
"tcp"
,
bindaddr
.
Addr
,
certManager
)
}
if
err
!=
nil
{
log
.
Printf
(
"error opening listener: %s"
,
err
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment