From 7dccd21b2982b5b55e845631fb6e86b65849c3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 1 Dec 2020 19:22:08 +0100 Subject: [PATCH] allow changing github oauth org and teams MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- README.md | 2 ++ defaults/main.yml | 2 ++ templates/grafana.ini.j2 | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d9ec98f..a91dd99 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,8 @@ You should also configure OAuth: ```yaml grafana_oauth_id: '123qwe123qwe123' grafana_oauth_secret: 'qweasdqweasdqweasdqweasd +grafana_oauth_gh_org: 'evil-corp' +grafana_oauth_gh_team_ids: [ 1234, 5678 ] ``` Optional email configuration might be useful: ```yaml diff --git a/defaults/main.yml b/defaults/main.yml index 45b632b..e9e1d54 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -23,6 +23,8 @@ grafana_password: ~ # OAuth secrets grafana_oauth_id: ~ grafana_oauth_secret: ~ +grafana_oauth_gh_org: 'status-im' +grafana_oauth_gh_team_ids: [] # SMTP for invite emails grafana_smtp_enabled: false diff --git a/templates/grafana.ini.j2 b/templates/grafana.ini.j2 index c7eaa80..2bef943 100644 --- a/templates/grafana.ini.j2 +++ b/templates/grafana.ini.j2 @@ -51,4 +51,7 @@ token_url = https://github.com/login/oauth/access_token api_url = https://api.github.com/user allow_sign_up = true # space-delimited organization names -allowed_organizations = status-im +allowed_organizations = {{ grafana_oauth_gh_org }} +{% if (grafana_oauth_gh_team_ids | length) > 0 %} +team_ids = {{ grafana_oauth_gh_team_ids | join(",") }} +{% endif %}