Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Nomad
Commits
b1f60121
Commit
b1f60121
authored
6 years ago
by
Chelsea Holland Komlo
Browse files
Options
Download
Email Patches
Plain Diff
fix reload issue for tls certificates in dev mode
parent
22fd6275
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
command/agent/command.go
+9
-9
command/agent/command.go
with
9 additions
and
9 deletions
+9
-9
command/agent/command.go
+
9
-
9
View file @
b1f60121
...
...
@@ -256,6 +256,15 @@ func (c *Command) readConfig() *Config {
}
}
// Set up the TLS configuration properly if we have one.
// XXX chelseakomlo: set up a TLSConfig New method which would wrap
// constructor-type actions like this.
if
config
.
TLSConfig
!=
nil
&&
!
config
.
TLSConfig
.
IsEmpty
()
{
if
err
:=
config
.
TLSConfig
.
SetChecksum
();
err
!=
nil
{
c
.
Ui
.
Error
(
fmt
.
Sprintf
(
"WARNING: Error when parsing TLS configuration: %v"
,
err
))
}
}
if
dev
{
// Skip validation for dev mode
return
config
...
...
@@ -319,15 +328,6 @@ func (c *Command) readConfig() *Config {
c
.
Ui
.
Error
(
"WARNING: Bootstrap mode enabled! Potentially unsafe operation."
)
}
// Set up the TLS configuration properly if we have one.
// XXX chelseakomlo: set up a TLSConfig New method which would wrap
// constructor-type actions like this.
if
config
.
TLSConfig
!=
nil
&&
!
config
.
TLSConfig
.
IsEmpty
()
{
if
err
:=
config
.
TLSConfig
.
SetChecksum
();
err
!=
nil
{
c
.
Ui
.
Error
(
fmt
.
Sprintf
(
"WARNING: Error when parsing TLS configuration: %v"
,
err
))
}
}
return
config
}
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help