mirror of
https://github.com/zulip/zulip.git
synced 2025-10-23 16:14:02 +00:00
docs: Fix misaligned Markdown source indentation.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
(cherry picked from commit cb61ea69c6
)
This commit is contained in:
@@ -368,9 +368,9 @@ it as follows:
|
||||
|
||||
The `Entity ID` should match the value of
|
||||
`SOCIAL_AUTH_SAML_SP_ENTITY_ID` computed in the Zulip settings.
|
||||
You can get the correct value by running the following:
|
||||
You can get the correct value by running the following:
|
||||
`/home/zulip/deployments/current/scripts/get-django-setting
|
||||
SOCIAL_AUTH_SAML_SP_ENTITY_ID`.
|
||||
SOCIAL_AUTH_SAML_SP_ENTITY_ID`.
|
||||
|
||||
* **SSO URL**:
|
||||
`https://yourzulipdomain.example.com/complete/saml/`. This is
|
||||
|
@@ -30,13 +30,13 @@ because it doesn't require a public IP address or setting up MX
|
||||
records in DNS.
|
||||
|
||||
```eval_rst
|
||||
.. note::
|
||||
Incoming emails are rate-limited, with the following limits:
|
||||
.. note::
|
||||
Incoming emails are rate-limited, with the following limits:
|
||||
|
||||
* 50 emails per minute.
|
||||
* 120 emails per 5 minutes.
|
||||
* 600 emails per hour.
|
||||
```
|
||||
* 50 emails per minute.
|
||||
* 120 emails per 5 minutes.
|
||||
* 600 emails per hour.
|
||||
```
|
||||
|
||||
## Local delivery setup
|
||||
|
||||
|
@@ -44,24 +44,24 @@ as world-readable, whereas the "uploaded files" one is not.
|
||||
setting to your default AWS region's code (e.g. `"eu-central-1"`).
|
||||
|
||||
1. You will need to configure `nginx` to direct requests for uploaded
|
||||
files to the Zulip server (which will then serve a redirect to the
|
||||
appropriate place in S3), rather than serving them directly.
|
||||
files to the Zulip server (which will then serve a redirect to the
|
||||
appropriate place in S3), rather than serving them directly.
|
||||
|
||||
With Zulip 1.9.0 and newer, you can do this automatically with the
|
||||
following commands run as root:
|
||||
With Zulip 1.9.0 and newer, you can do this automatically with the
|
||||
following commands run as root:
|
||||
|
||||
```
|
||||
crudini --set /etc/zulip/zulip.conf application_server no_serve_uploads true
|
||||
/home/zulip/deployments/current/scripts/zulip-puppet-apply
|
||||
```
|
||||
```
|
||||
crudini --set /etc/zulip/zulip.conf application_server no_serve_uploads true
|
||||
/home/zulip/deployments/current/scripts/zulip-puppet-apply
|
||||
```
|
||||
|
||||
(The first line will update your `/etc/zulip/zulip.conf`).
|
||||
(The first line will update your `/etc/zulip/zulip.conf`).
|
||||
|
||||
With older Zulip, you need to edit
|
||||
`/etc/nginx/sites-available/zulip-enterprise` to comment out the
|
||||
`nginx` configuration block for `/user_avatars` and the `include
|
||||
/etc/nginx/zulip-include/uploads.route` line and then reload the
|
||||
`nginx` service (`service nginx reload`).
|
||||
With older Zulip, you need to edit
|
||||
`/etc/nginx/sites-available/zulip-enterprise` to comment out the
|
||||
`nginx` configuration block for `/user_avatars` and the `include
|
||||
/etc/nginx/zulip-include/uploads.route` line and then reload the
|
||||
`nginx` service (`service nginx reload`).
|
||||
|
||||
1. Finally, restart the Zulip server so that your settings changes
|
||||
take effect
|
||||
|
Reference in New Issue
Block a user