mirror of
https://github.com/zulip/zulip.git
synced 2025-11-04 22:13:26 +00:00
docs: Fix grammar problems found by LanguageTool.
With tweaks to security-model.md by tabbott to expand the SSO acronym.
Ignored, but still needs discussion on whether we should exclude this
rule:
```
The word ‘install’ is not a noun.
✗ ...ble to connect to the client during the install process: So you'll need to shut down a...
^^^^^^^
✓ ...ble to connect to the client during the installation process: So you'll need to shut down a...
A_INSTALL: a/the + install
The word ‘install’ is not a noun.
✗ ...detected at install time will cause the install to abort. If you already have PostgreSQ...
^^^^^^^
✓ ...detected at install time will cause the installation to abort. If you already have PostgreSQ...
A_INSTALL: a/the + install
```
This commit is contained in:
@@ -125,7 +125,7 @@ Congratulations! The integration should be fully operational.
|
|||||||
su zulip -c '/home/zulip/deployments/current/manage.py email_mirror'
|
su zulip -c '/home/zulip/deployments/current/manage.py email_mirror'
|
||||||
```
|
```
|
||||||
|
|
||||||
1. Once everything is working, Install the cron job which will poll
|
1. Once everything is working, install the cron job which will poll
|
||||||
the inbox every minute for new messages using the tool you tested
|
the inbox every minute for new messages using the tool you tested
|
||||||
in the last step:
|
in the last step:
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
:orphan:
|
:orphan:
|
||||||
```
|
```
|
||||||
|
|
||||||
# Production installation on existing server
|
# Production installation on an existing server
|
||||||
|
|
||||||
Here are some tips for installing the latest release Zulip on a
|
Here are some tips for installing the latest release of Zulip on a
|
||||||
production server running Debian or Ubuntu. The Zulip installation
|
production server running Debian or Ubuntu. The Zulip installation
|
||||||
scripts assume that it has carte blanche to overwrite your
|
scripts assume that it has carte blanche to overwrite your
|
||||||
configuration files in /etc, so we recommend against installing it on
|
configuration files in /etc, so we recommend against installing it on
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ announcement).
|
|||||||
- Zulip requires CSRF tokens in all interactions with the web API to
|
- Zulip requires CSRF tokens in all interactions with the web API to
|
||||||
prevent CSRF attacks.
|
prevent CSRF attacks.
|
||||||
|
|
||||||
- The preferred way to log in to Zulip is using an SSO solution like
|
- The preferred way to log in to Zulip is using a single sign-on (SSO)
|
||||||
Google auth, LDAP, or similar, but Zulip also supports password
|
solution like Google authentication, LDAP, or similar, but Zulip
|
||||||
authentication. See
|
also supports password authentication. See [the authentication
|
||||||
[the authentication methods documentation](../production/authentication-methods.md)
|
methods documentation](../production/authentication-methods.md) for
|
||||||
for details on Zulip's available authentication methods.
|
details on Zulip's available authentication methods.
|
||||||
|
|
||||||
### Passwords
|
### Passwords
|
||||||
|
|
||||||
@@ -168,11 +168,11 @@ strength allowed is controlled by two settings in
|
|||||||
|
|
||||||
- To properly remove a user's access to a Zulip team, it does not
|
- To properly remove a user's access to a Zulip team, it does not
|
||||||
suffice to change their password or deactivate their account in a
|
suffice to change their password or deactivate their account in a
|
||||||
SSO system, since neither of those prevents authenticating with the
|
single sign-on (SSO) system, since neither of those prevents
|
||||||
user's API key or those of bots the user has created. Instead, you
|
authenticating with the user's API key or those of bots the user has
|
||||||
should
|
created. Instead, you should [deactivate the user's
|
||||||
[deactivate the user's account](https://zulip.com/help/deactivate-or-reactivate-a-user)
|
account](https://zulip.com/help/deactivate-or-reactivate-a-user) via
|
||||||
via Zulip's "Organization settings" interface.
|
Zulip's "Organization settings" interface.
|
||||||
|
|
||||||
- The Zulip mobile apps authenticate to the server by sending the
|
- The Zulip mobile apps authenticate to the server by sending the
|
||||||
user's password and retrieving the user's API key; the apps then use
|
user's password and retrieving the user's API key; the apps then use
|
||||||
@@ -260,7 +260,7 @@ strength allowed is controlled by two settings in
|
|||||||
|
|
||||||
- Notably, these first 3 features give end users (limited) control to cause
|
- Notably, these first 3 features give end users (limited) control to cause
|
||||||
the Zulip server to make HTTP requests on their behalf. Because of this,
|
the Zulip server to make HTTP requests on their behalf. Because of this,
|
||||||
Zulip routes all outgoing outgoing HTTP requests [through
|
Zulip routes all outgoing HTTP requests [through
|
||||||
Smokescreen][smokescreen-setup] to ensure that Zulip cannot be
|
Smokescreen][smokescreen-setup] to ensure that Zulip cannot be
|
||||||
used to execute [SSRF attacks][ssrf] against other systems on an
|
used to execute [SSRF attacks][ssrf] against other systems on an
|
||||||
internal corporate network. The default Smokescreen configuration
|
internal corporate network. The default Smokescreen configuration
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ su zulip -c '/home/zulip/deployments/current/scripts/restart-server'
|
|||||||
Zulip has dozens of settings documented in the comments in
|
Zulip has dozens of settings documented in the comments in
|
||||||
`/etc/zulip/settings.py`; you can review [the latest version of the
|
`/etc/zulip/settings.py`; you can review [the latest version of the
|
||||||
settings.py template][settings-py-template], and if you've upgraded
|
settings.py template][settings-py-template], and if you've upgraded
|
||||||
from an old versions of Zulip, we recommend [carefully updating your
|
from an old version of Zulip, we recommend [carefully updating your
|
||||||
`/etc/zulip/settings.py`][update-settings-docs] to fold in the inline
|
`/etc/zulip/settings.py`][update-settings-docs] to fold in the inline
|
||||||
comment documentation for new configuration settings after upgrading
|
comment documentation for new configuration settings after upgrading
|
||||||
to each new major release.
|
to each new major release.
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ installation, you'll need to register a custom Zoom app as follows:
|
|||||||
- Disable the option to publish the app on the Marketplace.
|
- Disable the option to publish the app on the Marketplace.
|
||||||
- Click **Create**.
|
- Click **Create**.
|
||||||
|
|
||||||
1. Inside of the Zoom app management page:
|
1. Inside the Zoom app management page:
|
||||||
|
|
||||||
- On the **App Credentials** tab, set both the **Redirect URL for
|
- On the **App Credentials** tab, set both the **Redirect URL for
|
||||||
OAuth** and the **Whitelist URL** to
|
OAuth** and the **Whitelist URL** to
|
||||||
|
|||||||
Reference in New Issue
Block a user