Ori.livneh has submitted this change and it was merged. Change subject: grafana 2: disable auth.basic ......................................................................
grafana 2: disable auth.basic because it conflicts with auth.proxy. See <https://github.com/grafana/grafana/issues/2357> Change-Id: Ide7fa20191f60c53a9e0d182d81da6a7c381668a --- M manifests/role/grafana2.pp 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/manifests/role/grafana2.pp b/manifests/role/grafana2.pp index f81a452..d548bf7 100644 --- a/manifests/role/grafana2.pp +++ b/manifests/role/grafana2.pp @@ -38,6 +38,12 @@ admin_password => $passwords::grafana::admin_password, }, + # Disabled auth.basic, because it conflicts with auth.proxy. + # See <https://github.com/grafana/grafana/issues/2357> + 'auth.basic' => { + enabled => false, + }, + # Automatically create an account for users and authenticate # them based on the REMOTE_USER env var set by mod_authnz_ldap. 'auth.proxy' => { -- To view, visit https://gerrit.wikimedia.org/r/245885 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ide7fa20191f60c53a9e0d182d81da6a7c381668a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
