Fix #162: Key is no longer mistakenly overwritten by cert

matthieugrieger · matthieugrieger · commit d0becb9c1047 · 2016-06-29T19:08:01.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 MumbleDJ Changelog
 ==================
 
+### June 29, 2016 -- `v3.0.10`
+* Fixed issue related to PEM keys being overwritten by PEM certs.
+
 ### June 28, 2016 -- `v3.0.9`
 * Queue is now reset after disconnecting from the server to avoid unpredictable behavior.
 
diff --git a/bot/mumbledj.go b/bot/mumbledj.go
@@ -195,7 +195,7 @@ func (dj *MumbleDJ) Connect() error {
 		dj.TLSConfig.InsecureSkipVerify = true
 	}
 	if viper.GetString("connection.cert") != "" {
-		if viper.GetString("connection.key") != "" {
+		if viper.GetString("connection.key") == "" {
 			viper.Set("connection.key", viper.GetString("connection.cert"))
 		}
 
diff --git a/main.go b/main.go
@@ -32,7 +32,7 @@ func init() {
 	services.DJ = DJ
 	bot.DJ = DJ
 
-	DJ.Version = "v3.0.9"
+	DJ.Version = "v3.0.10"
 
 	logrus.SetLevel(logrus.WarnLevel)
 }

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ func (dj *MumbleDJ) Connect() error {`
`195`	`195`	`dj.TLSConfig.InsecureSkipVerify = true`
`196`	`196`	`}`
`197`	`197`	`if viper.GetString("connection.cert") != "" {`
`198`		`- if viper.GetString("connection.key") != "" {`
	`198`	`+ if viper.GetString("connection.key") == "" {`
`199`	`199`	`viper.Set("connection.key", viper.GetString("connection.cert"))`
`200`	`200`	`}`
`201`	`201`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func init() {`
`32`	`32`	`services.DJ = DJ`
`33`	`33`	`bot.DJ = DJ`
`34`	`34`
`35`		`- DJ.Version = "v3.0.9"`
	`35`	`+ DJ.Version = "v3.0.10"`
`36`	`36`
`37`	`37`	`logrus.SetLevel(logrus.WarnLevel)`
`38`	`38`	`}`