Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit e938f69

Browse files
authored
Fix some links in docs and contrib (#10370)
1 parent d9b3637 commit e938f69

File tree

9 files changed

+23
-17
lines changed

9 files changed

+23
-17
lines changed

changelog.d/10370.doc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix some links in `docs` and `contrib`.

contrib/docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ services:
5656
- POSTGRES_USER=synapse
5757
- POSTGRES_PASSWORD=changeme
5858
# ensure the database gets created correctly
59-
# https://github.com/matrix-org/synapse/blob/master/docs/postgres.md#set-up-database
59+
# https://matrix-org.github.io/synapse/latest/postgres.html#set-up-database
6060
- POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
6161
volumes:
6262
# You may store the database tables in a local folder..

contrib/grafana/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Using the Synapse Grafana dashboard
22

33
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/
4-
1. Have your Prometheus scrape your Synapse. https://github.com/matrix-org/synapse/blob/master/docs/metrics-howto.md
4+
1. Have your Prometheus scrape your Synapse. https://matrix-org.github.io/synapse/latest/metrics-howto.html
55
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/
6-
3. Set up required recording rules. https://github.com/matrix-org/synapse/tree/master/contrib/prometheus
6+
3. Set up required recording rules. [contrib/prometheus](../prometheus)

contrib/prometheus/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Add a new job to the main prometheus.yml file:
3434
```
3535
3636
An example of a Prometheus configuration with workers can be found in
37-
[metrics-howto.md](https://github.com/matrix-org/synapse/blob/master/docs/metrics-howto.md).
37+
[metrics-howto.md](https://matrix-org.github.io/synapse/latest/metrics-howto.html).
3838
3939
To use `synapse.rules` add
4040

contrib/purge_api/README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ Purge history API examples
33

44
# `purge_history.sh`
55

6-
A bash file, that uses the [purge history API](/docs/admin_api/purge_history_api.rst) to
7-
purge all messages in a list of rooms up to a certain event. You can select a
6+
A bash file, that uses the
7+
[purge history API](https://matrix-org.github.io/synapse/latest/admin_api/purge_history_api.html)
8+
to purge all messages in a list of rooms up to a certain event. You can select a
89
timeframe or a number of messages that you want to keep in the room.
910

1011
Just configure the variables DOMAIN, ADMIN, ROOMS_ARRAY and TIME at the top of
1112
the script.
1213

1314
# `purge_remote_media.sh`
1415

15-
A bash file, that uses the [purge history API](/docs/admin_api/purge_history_api.rst) to
16-
purge all old cached remote media.
16+
A bash file, that uses the
17+
[purge history API](https://matrix-org.github.io/synapse/latest/admin_api/purge_history_api.html)
18+
to purge all old cached remote media.

contrib/purge_api/purge_history.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
# this script will use the api:
4-
# https://github.com/matrix-org/synapse/blob/master/docs/admin_api/purge_history_api.rst
4+
# https://matrix-org.github.io/synapse/latest/admin_api/purge_history_api.html
55
#
66
# It will purge all messages in a list of rooms up to a cetrain event
77

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
The documentation for using systemd to manage synapse workers is now part of
2-
the main synapse distribution. See [docs/systemd-with-workers](../../docs/systemd-with-workers).
2+
the main synapse distribution. See
3+
[docs/systemd-with-workers](https://matrix-org.github.io/synapse/latest/systemd-with-workers/index.html).

docs/systemd-with-workers/README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ contains an example configuration for the `federation_reader` worker.
1515
## Synapse configuration files
1616

1717
See [workers.md](../workers.md) for information on how to set up the
18-
configuration files and reverse-proxy correctly. You can find an example worker
19-
config in the [workers](https://github.com/matrix-org/synapse/tree/develop/docs/systemd-with-workers/workers/)
20-
folder.
18+
configuration files and reverse-proxy correctly.
19+
Below is a sample `federation_reader` worker configuration file.
20+
```yaml
21+
{{#include workers/federation_reader.yaml}}
22+
```
2123

2224
Systemd manages daemonization itself, so ensure that none of the configuration
2325
files set either `daemonize` or `worker_daemonize`.
@@ -72,12 +74,12 @@ systemctl restart matrix-synapse.target
7274

7375
**Optional:** If further hardening is desired, the file
7476
`override-hardened.conf` may be copied from
75-
`contrib/systemd/override-hardened.conf` in this repository to the location
77+
[contrib/systemd/override-hardened.conf](https://github.com/matrix-org/synapse/tree/develop/contrib/systemd/)
78+
in this repository to the location
7679
`/etc/systemd/system/matrix-synapse.service.d/override-hardened.conf` (the
7780
directory may have to be created). It enables certain sandboxing features in
7881
systemd to further secure the synapse service. You may read the comments to
79-
understand what the override file is doing. The same file will need to be copied
80-
to
82+
understand what the override file is doing. The same file will need to be copied to
8183
`/etc/systemd/system/[email protected]/override-hardened-worker.conf`
8284
(this directory may also have to be created) in order to apply the same
8385
hardening options to any worker processes.

docs/usage/configuration/logging_sample_config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ a fresh config using Synapse by following the instructions in
1111

1212
```yaml
1313
{{#include ../../sample_log_config.yaml}}
14-
``__`
14+
```

0 commit comments

Comments
 (0)