Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-08-18 23:50:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

deploy: a743f7d33e

Browse source
This commit is contained in:
richvdh 2022-04-14 12:09:42 +00:00
parent f588686c42
commit aee2fb3187
7 changed files with 45 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
develop/print.html
View file

@ -9048,12 +9048,10 @@ worker_replication_host: 127.0.0.1
worker_replication_http_port: 9093 worker_replication_http_port: 9093
worker_listeners: worker_listeners:
- type: http - type: http
port: 8083 port: 8083
resources: resources:
- names: - names: [client, federation]
- client
- federation
worker_log_config: /home/matrix/synapse/config/worker1_log_config.yaml worker_log_config: /home/matrix/synapse/config/worker1_log_config.yaml
</code></pre> </code></pre>
@ -9463,24 +9461,24 @@ require. Additionally, to group the required services, it sets up a
<p>See the folder <a href="https://github.com/matrix-org/synapse/tree/develop/docs/systemd-with-workers/system/">system</a> <p>See the folder <a href="https://github.com/matrix-org/synapse/tree/develop/docs/systemd-with-workers/system/">system</a>
for the systemd unit files.</p> for the systemd unit files.</p>
<p>The folder <a href="https://github.com/matrix-org/synapse/tree/develop/docs/systemd-with-workers/workers/">workers</a> <p>The folder <a href="https://github.com/matrix-org/synapse/tree/develop/docs/systemd-with-workers/workers/">workers</a>
contains an example configuration for the <code>federation_reader</code> worker.</p> contains an example configuration for the <code>generic_worker</code> worker.</p>
<h2 id="synapse-configuration-files"><a class="header" href="#synapse-configuration-files">Synapse configuration files</a></h2> <h2 id="synapse-configuration-files"><a class="header" href="#synapse-configuration-files">Synapse configuration files</a></h2>
<p>See <a href="systemd-with-workers/../workers.html">the worker documentation</a> for information on how to set up the <p>See <a href="systemd-with-workers/../workers.html">the worker documentation</a> for information on how to set up the
configuration files and reverse-proxy correctly. configuration files and reverse-proxy correctly.
Below is a sample <code>federation_reader</code> worker configuration file.</p> Below is a sample <code>generic_worker</code> worker configuration file.</p>
<pre><code class="language-yaml">worker_app: synapse.app.federation_reader <pre><code class="language-yaml">worker_app: synapse.app.generic_worker
worker_name: federation_reader1 worker_name: generic_worker1
worker_replication_host: 127.0.0.1 worker_replication_host: 127.0.0.1
worker_replication_http_port: 9093 worker_replication_http_port: 9093
worker_listeners: worker_listeners:
- type: http - type: http
port: 8011 port: 8011
resources: resources:
- names: [federation] - names: [client, federation]
worker_log_config: /etc/matrix-synapse/federation-reader-log.yaml worker_log_config: /etc/matrix-synapse/generic-worker-log.yaml
</code></pre> </code></pre>
<p>Systemd manages daemonization itself, so ensure that none of the configuration <p>Systemd manages daemonization itself, so ensure that none of the configuration
files set either <code>daemonize</code> or <code>worker_daemonize</code>.</p> files set either <code>daemonize</code> or <code>worker_daemonize</code>.</p>
@ -9515,9 +9513,9 @@ systemctl stop matrix-synapse.target
# Restart the master alone # Restart the master alone
systemctl start matrix-synapse.service systemctl start matrix-synapse.service
# Restart a specific worker (eg. federation_reader); the master is # Restart a specific worker (eg. generic_worker); the master is
# unaffected by this. # unaffected by this.
systemctl restart matrix-synapse-worker@federation_reader.service systemctl restart matrix-synapse-worker@generic_worker.service
# Add a new worker (assuming all configs are set up already) # Add a new worker (assuming all configs are set up already)
systemctl enable matrix-synapse-worker@federation_writer.service systemctl enable matrix-synapse-worker@federation_writer.service

2
develop/searchindex.js
View file

File diff suppressed because one or more lines are too long

2
develop/searchindex.json
View file

File diff suppressed because one or more lines are too long

22
develop/systemd-with-workers/index.html
View file

@ -155,24 +155,24 @@ require. Additionally, to group the required services, it sets up a
<p>See the folder <a href="https://github.com/matrix-org/synapse/tree/develop/docs/systemd-with-workers/system/">system</a> <p>See the folder <a href="https://github.com/matrix-org/synapse/tree/develop/docs/systemd-with-workers/system/">system</a>
for the systemd unit files.</p> for the systemd unit files.</p>
<p>The folder <a href="https://github.com/matrix-org/synapse/tree/develop/docs/systemd-with-workers/workers/">workers</a> <p>The folder <a href="https://github.com/matrix-org/synapse/tree/develop/docs/systemd-with-workers/workers/">workers</a>
contains an example configuration for the <code>federation_reader</code> worker.</p> contains an example configuration for the <code>generic_worker</code> worker.</p>
<h2 id="synapse-configuration-files"><a class="header" href="#synapse-configuration-files">Synapse configuration files</a></h2> <h2 id="synapse-configuration-files"><a class="header" href="#synapse-configuration-files">Synapse configuration files</a></h2>
<p>See <a href="../workers.html">the worker documentation</a> for information on how to set up the <p>See <a href="../workers.html">the worker documentation</a> for information on how to set up the
configuration files and reverse-proxy correctly. configuration files and reverse-proxy correctly.
Below is a sample <code>federation_reader</code> worker configuration file.</p> Below is a sample <code>generic_worker</code> worker configuration file.</p>
<pre><code class="language-yaml">worker_app: synapse.app.federation_reader <pre><code class="language-yaml">worker_app: synapse.app.generic_worker
worker_name: federation_reader1 worker_name: generic_worker1
worker_replication_host: 127.0.0.1 worker_replication_host: 127.0.0.1
worker_replication_http_port: 9093 worker_replication_http_port: 9093
worker_listeners: worker_listeners:
- type: http - type: http
port: 8011 port: 8011
resources: resources:
- names: [federation] - names: [client, federation]
worker_log_config: /etc/matrix-synapse/federation-reader-log.yaml worker_log_config: /etc/matrix-synapse/generic-worker-log.yaml
</code></pre> </code></pre>
<p>Systemd manages daemonization itself, so ensure that none of the configuration <p>Systemd manages daemonization itself, so ensure that none of the configuration
files set either <code>daemonize</code> or <code>worker_daemonize</code>.</p> files set either <code>daemonize</code> or <code>worker_daemonize</code>.</p>
@ -207,9 +207,9 @@ systemctl stop matrix-synapse.target
# Restart the master alone # Restart the master alone
systemctl start matrix-synapse.service systemctl start matrix-synapse.service
# Restart a specific worker (eg. federation_reader); the master is # Restart a specific worker (eg. generic_worker); the master is
# unaffected by this. # unaffected by this.
systemctl restart matrix-synapse-worker@federation_reader.service systemctl restart matrix-synapse-worker@generic_worker.service
# Add a new worker (assuming all configs are set up already) # Add a new worker (assuming all configs are set up already)
systemctl enable matrix-synapse-worker@federation_writer.service systemctl enable matrix-synapse-worker@federation_writer.service

13
develop/systemd-with-workers/workers/federation_reader.yaml
View file

@ -1,13 +0,0 @@
worker_app: synapse.app.federation_reader
worker_name: federation_reader1
worker_replication_host: 127.0.0.1
worker_replication_http_port: 9093
worker_listeners:
- type: http
port: 8011
resources:
- names: [federation]
worker_log_config: /etc/matrix-synapse/federation-reader-log.yaml

13
develop/systemd-with-workers/workers/generic_worker.yaml Normal file
View file

@ -0,0 +1,13 @@
worker_app: synapse.app.generic_worker
worker_name: generic_worker1
worker_replication_host: 127.0.0.1
worker_replication_http_port: 9093
worker_listeners:
- type: http
port: 8011
resources:
- names: [client, federation]
worker_log_config: /etc/matrix-synapse/generic-worker-log.yaml

10
develop/workers.html
View file

@ -257,12 +257,10 @@ worker_replication_host: 127.0.0.1
worker_replication_http_port: 9093 worker_replication_http_port: 9093
worker_listeners: worker_listeners:
- type: http - type: http
port: 8083 port: 8083
resources: resources:
- names: - names: [client, federation]
- client
- federation
worker_log_config: /home/matrix/synapse/config/worker1_log_config.yaml worker_log_config: /home/matrix/synapse/config/worker1_log_config.yaml
</code></pre> </code></pre>