From fc672e988c6281476563149341f91ff4bc20cf7f Mon Sep 17 00:00:00 2001
From: Jason Blais <13119842+jasonblais@users.noreply.github.com>
Date: Fri, 17 May 2019 12:38:55 -0400
Subject: [PATCH] Add two missing bot settings to default.json (#10867)

* Add two missing bot settings to default.json

`DisableBotsWhenOwnerIsDeactivated` was added to model/config.go by https://github.com/mattermost/mattermost-server/commit/06b579d18aa3bb5d1aa960f4a3261c9d3d430cb4#diff-2279f86634da3f787f279961af76713a

`EnableBotAccountCreation` was added to model/config.go by https://github.com/mattermost/mattermost-server/commit/30061df0360489f5ebf0be4236be8ec2182f0c3e#diff-2279f86634da3f787f279961af76713a

* Update default.json

* Update diagnostics_test.go

* Revert accidental commit
---
 config/default.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/default.json b/config/default.json
index b693daf2a2..2cb17ad78d 100644
--- a/config/default.json
+++ b/config/default.json
@@ -77,7 +77,9 @@
         "DisableLegacyMFA": true,
         "EnableEmailInvitations": false,
         "ExperimentalLdapGroupSync": false,
-        "ExperimentalStrictCSRFEnforcement": false
+        "ExperimentalStrictCSRFEnforcement": false,
+        "CreateBotAccounts": false,
+        "DisableBotsWhenOwnerIsDeactivated": true
     },
     "TeamSettings": {
         "SiteName": "Mattermost",