From 67b0d2175dd64d436ffcd95ba58677e43d206770 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@kbt.io>
Date: Wed, 29 Nov 2017 13:47:42 +0100
Subject: Set OpenID support on by default when installing new instance (#3010)

---
 modules/setting/setting.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index d4f92dee39..9bb7da4456 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -1165,7 +1165,7 @@ func newService() {
 	Service.NoReplyAddress = sec.Key("NO_REPLY_ADDRESS").MustString("noreply.example.org")
 
 	sec = Cfg.Section("openid")
-	Service.EnableOpenIDSignIn = sec.Key("ENABLE_OPENID_SIGNIN").MustBool(false)
+	Service.EnableOpenIDSignIn = sec.Key("ENABLE_OPENID_SIGNIN").MustBool(!InstallLock)
 	Service.EnableOpenIDSignUp = sec.Key("ENABLE_OPENID_SIGNUP").MustBool(!Service.DisableRegistration && Service.EnableOpenIDSignIn)
 	pats := sec.Key("WHITELISTED_URIS").Strings(" ")
 	if len(pats) != 0 {
-- 
cgit v1.2.3