paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

config_error.html: Use render_markdown_path for error content.

Browse Source
This commit is contained in:
Vaida Plankyte
2017-08-17 10:49:19 +01:00
committed by showell
parent 8a29f1dcf2
commit 919ca3431f
3 changed files with 23 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
templates/zerver/config_error.html
View File

@@ -11,56 +11,11 @@
<h1 class="lead">Configuration error</h1>
<br/>
{% if google_error %}
<p>
You are using the <b>Google auth backend</b>,
but it is not properly configured. Please
check the following:
</p>
<ul>
<li>
You have created a Google Oauth2 client
and enabled the Google+ API. You can
create OAuth2 apps
at <a href="https://console.developers.google.com">https://console.developers.google.com</a>.
</li>
<li>
You have configured your OAuth2 client to
allow redirects to your server's Google
auth URL:
<code>{{ server_uri }}/accounts/login/google/done/</code>.
</li>
<li>
You have
set <code>GOOGLE_OAUTH2_CLIENT_ID</code>
in <code>{{ settings_path }}</code>
and <code>google_oauth2_client_secret</code>
in <code>{{ secrets_path }}</code>.
</li>
</ul>
{{ render_markdown_path('zerver/google-error.md', {"server_uri": server_uri, "settings_path": settings_path, "secrets_path": secrets_path}) }}
{% endif %}
{% if github_error %}
<p>
You are using the <b>GitHub auth backend</b>,
but it is not properly configured. Please
check the following:
</p>
<ul>
<li>
You have added <code>{{ server_uri }}/complete/github/</code>
as the callback URL in the OAuth application in
GitHub. You can create OAuth apps
from <a href="https://github.com/settings/developers">GitHub's
developer site</a>.
</li>
<li>
You have set <code>SOCIAL_AUTH_GITHUB_KEY</code>
in <code>{{ settings_path }}</code>
and <code>social_auth_github_secret</code>
in <code>{{ secrets_path }}</code> with
the values from your OAuth application.
</li>
</ul>
{{ render_markdown_path('zerver/github-error.md', {"server_uri": server_uri, "settings_path": settings_path, "secrets_path": secrets_path}) }}
{% endif %}
<p>After making your changes, remember to restart

10
templates/zerver/github-error.md Normal file
View File

@@ -0,0 +1,10 @@
You are using the **GitHub auth backend**, but it is not properly
configured. Please check the following:
You have added `{{ server_uri }}/complete/github/` as the callback URL
in the OAuth application in GitHub. You can create OAuth apps from
[GitHub's developer site](https://github.com/settings/developers).
* You have set `SOCIAL_AUTH_GITHUB_KEY` in `{{ settings_path }}` and
`social_auth_github_secret` in `{{ secrets_path }}` with the values
from your OAuth application.

11
templates/zerver/google-error.md Normal file
View File

@@ -0,0 +1,11 @@
You are using the **Google auth backend**, but it is not properly
configured. Please check the following:
* You have created a Google Oauth2 client and enabled the Google+ API.
You can create OAuth2 apps at [the Google developer console](https://console.developers.google.com).
* You have configured your OAuth2 client to allow redirects to your
server's Google auth URL: `{{ server_uri }}/accounts/login/google/done/`.
* You have set `GOOGLE_OAUTH2_CLIENT_ID` in `{{ settings_path }}` and
`google_oauth2_client_secret` in `{{ secrets_path }}`.