luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #3858 from hashicorp/enterprise-defaults 

Add enterprise default config section
This commit is contained in:
Kyle Havlovitz 2018-02-05 13:38:16 -08:00 committed by GitHub
parent 58354510cf 46745eb89b
commit e6f84e783c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/config/builder.go
View File

@ -125,7 +125,7 @@ func NewBuilder(flags Flags) (*Builder, error) {
Data: s,
})
}
b.Tail = append(b.Tail, NonUserSource(), DefaultConsulSource(), DefaultVersionSource())
b.Tail = append(b.Tail, NonUserSource(), DefaultConsulSource(), DefaultEnterpriseSource(), DefaultVersionSource())
if b.boolVal(b.Flags.DevMode) {
b.Tail = append(b.Tail, DevConsulSource())
}

13
agent/config/default_oss.go Normal file
View File

@ -0,0 +1,13 @@
// +build !ent
package config
// DefaultEnterpriseSource returns the consul agent configuration for the enterprise mode.
// This should be merged in the tail after the DefaultConsulSource.
func DefaultEnterpriseSource() Source {
return Source{
Name: "enterprise",
Format: "hcl",
Data: ``,
}
}

3
website/source/docs/agent/options.html.md
View File

@ -881,7 +881,8 @@ Consul will not enable TLS for the HTTP API unless the `https` port has been ass
0.8 the default was changed to true, to make remote exec opt-in instead of opt-out.
* <a name="disable_update_check"></a><a href="#disable_update_check">`disable_update_check`</a>
Disables automatic checking for security bulletins and new version releases.
Disables automatic checking for security bulletins and new version releases. This is disabled in
Consul Enterprise.
* <a name="discard_check_output"></a><a href="#discard_check_output">`discard_check_output`</a>
Discards the output of health checks before storing them. This reduces the number of writes