From f6ecaa4a1c7f909bb47ba637f679990d30f98aed Mon Sep 17 00:00:00 2001
From: Kyle Havlovitz <kylehav@gmail.com>
Date: Mon, 5 Feb 2018 13:25:28 -0800
Subject: [PATCH] Add enterprise default config section

---
 agent/config/builder.go                   |  2 +-
 agent/config/default_oss.go               | 13 +++++++++++++
 website/source/docs/agent/options.html.md |  3 ++-
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 agent/config/default_oss.go

diff --git a/agent/config/builder.go b/agent/config/builder.go
index 458a750060..5602522db7 100644
--- a/agent/config/builder.go
+++ b/agent/config/builder.go
@@ -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())
 	}
diff --git a/agent/config/default_oss.go b/agent/config/default_oss.go
new file mode 100644
index 0000000000..f87db4e1b2
--- /dev/null
+++ b/agent/config/default_oss.go
@@ -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:   ``,
+	}
+}
diff --git a/website/source/docs/agent/options.html.md b/website/source/docs/agent/options.html.md
index 8bc6c5d9dd..4b4caeb780 100644
--- a/website/source/docs/agent/options.html.md
+++ b/website/source/docs/agent/options.html.md
@@ -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