瀏覽代碼

Merge pull request #2072 from yinchuan/patch-1

update docs for configration: allowed_domains
Torkel Ödegaard 10 年之前
父節點
當前提交
db2ff68fef
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      docs/sources/installation/configuration.md

+ 2 - 2
docs/sources/installation/configuration.md

@@ -296,12 +296,12 @@ Secret. Specify these in the Grafana configuration file. For example:
     scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
     scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
     auth_url = https://accounts.google.com/o/oauth2/auth
     auth_url = https://accounts.google.com/o/oauth2/auth
     token_url = https://accounts.google.com/o/oauth2/token
     token_url = https://accounts.google.com/o/oauth2/token
-    allowed_domains = mycompany.com
+    allowed_domains = mycompany.com mycompany.org
     allow_sign_up = false
     allow_sign_up = false
 
 
 Restart the Grafana back-end. You should now see a Google login button
 Restart the Grafana back-end. You should now see a Google login button
 on the login page. You can now login or sign up with your Google
 on the login page. You can now login or sign up with your Google
-accounts. The `allowed_domains` option is optional.
+accounts. The `allowed_domains` option is optional, and domains were seperated by space.
 
 
 You may allow users to sign-up via Google authentication by setting the
 You may allow users to sign-up via Google authentication by setting the
 `allow_sign_up` option to `true`. When this option is set to `true`, any
 `allow_sign_up` option to `true`. When this option is set to `true`, any