From 7d65dd88989d56e205d0b10625845d18edf53b41 Mon Sep 17 00:00:00 2001
From: Jesse Peterson <jessepeterson@users.noreply.github.com>
Date: Fri, 15 Feb 2019 12:09:14 -0800
Subject: [PATCH] By default, switch to the new config (#567)

* By default, switch to the new config

* Update CHANGELOG
---
 CHANGELOG.md         | 1 +
 cmd/mdmctl/config.go | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7725af75..e4a2dc41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Remove deprecated `-apns` flags from server startup (#528)
 * Move API calls to list endpoints from HTTP GET to HTTP POST (#522, #523, #524, #525, #526)
 * Add support for the ApplicationConfiguration Setting (#521)
+* Fix bug in mdmctl server saving, switch config when saving automatically (#565, #566)
 
 ## [v1.4.0](https://github.com/micromdm/micromdm/compare/v1.3.1...v1.4.0) September 6 2018
 
diff --git a/cmd/mdmctl/config.go b/cmd/mdmctl/config.go
index 1c7f8ca7..4cdc341c 100644
--- a/cmd/mdmctl/config.go
+++ b/cmd/mdmctl/config.go
@@ -161,7 +161,11 @@ func setCmd(args []string) error {
 
 	cfg.SkipVerify = *flSkipVerify
 
-	return saveServerConfig(cfg, *flName)
+	err = saveServerConfig(cfg, *flName)
+	if err != nil {
+		return err
+	}
+	return switchServerConfig(*flName)
 }
 
 func switchCmd(args []string) error {