forked from matrix-org/synapse
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
23 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Fix some links in `docs` and `contrib`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
# Using the Synapse Grafana dashboard | ||
|
||
0. Set up Prometheus and Grafana. Out of scope for this readme. Useful documentation about using Grafana with Prometheus: http://docs.grafana.org/features/datasources/prometheus/ | ||
1. Have your Prometheus scrape your Synapse. https://github.com/matrix-org/synapse/blob/master/docs/metrics-howto.md | ||
1. Have your Prometheus scrape your Synapse. https://matrix-org.github.io/synapse/latest/metrics-howto.html | ||
2. Import dashboard into Grafana. Download `synapse.json`. Import it to Grafana and select the correct Prometheus datasource. http://docs.grafana.org/reference/export_import/ | ||
3. Set up required recording rules. https://github.com/matrix-org/synapse/tree/master/contrib/prometheus | ||
3. Set up required recording rules. [contrib/prometheus](../prometheus) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
The documentation for using systemd to manage synapse workers is now part of | ||
the main synapse distribution. See [docs/systemd-with-workers](../../docs/systemd-with-workers). | ||
the main synapse distribution. See | ||
[docs/systemd-with-workers](https://matrix-org.github.io/synapse/latest/systemd-with-workers/index.html). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,9 +15,11 @@ contains an example configuration for the `federation_reader` worker. | |
## Synapse configuration files | ||
|
||
See [workers.md](../workers.md) for information on how to set up the | ||
configuration files and reverse-proxy correctly. You can find an example worker | ||
config in the [workers](https://github.com/matrix-org/synapse/tree/develop/docs/systemd-with-workers/workers/) | ||
folder. | ||
configuration files and reverse-proxy correctly. | ||
Below is a sample `federation_reader` worker configuration file. | ||
```yaml | ||
{{#include workers/federation_reader.yaml}} | ||
``` | ||
|
||
Systemd manages daemonization itself, so ensure that none of the configuration | ||
files set either `daemonize` or `worker_daemonize`. | ||
|
@@ -72,12 +74,12 @@ systemctl restart matrix-synapse.target | |
|
||
**Optional:** If further hardening is desired, the file | ||
`override-hardened.conf` may be copied from | ||
`contrib/systemd/override-hardened.conf` in this repository to the location | ||
[contrib/systemd/override-hardened.conf](https://github.com/matrix-org/synapse/tree/develop/contrib/systemd/) | ||
in this repository to the location | ||
`/etc/systemd/system/matrix-synapse.service.d/override-hardened.conf` (the | ||
directory may have to be created). It enables certain sandboxing features in | ||
systemd to further secure the synapse service. You may read the comments to | ||
understand what the override file is doing. The same file will need to be copied | ||
to | ||
understand what the override file is doing. The same file will need to be copied to | ||
`/etc/systemd/system/[email protected]/override-hardened-worker.conf` | ||
(this directory may also have to be created) in order to apply the same | ||
hardening options to any worker processes. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters