Compare commits

...

4 Commits

Author SHA1 Message Date
uumas
bdc9e46534 synapse: add argument specs 2023-12-21 18:01:27 +02:00
uumas
e92410cac2 v0.0.4 2023-07-19 00:26:10 +03:00
uumas
af224d8312 update worker config to use instance map 2023-07-19 00:25:22 +03:00
uumas
dc1e49c6e1 remove msc2716 2023-07-19 00:24:53 +03:00
6 changed files with 58 additions and 11 deletions

View File

@@ -3,7 +3,7 @@
namespace: uumas namespace: uumas
name: matrix name: matrix
description: Matrix roles description: Matrix roles
version: 0.0.3 version: 0.0.4
readme: README.md readme: README.md
repository: https://git.uumas.fi/uumas/ansible-matrix repository: https://git.uumas.fi/uumas/ansible-matrix
license_file: LICENSE license_file: LICENSE

View File

@@ -1,6 +1,6 @@
--- ---
# Worker endpoints last updated on 2023-04-25 # Worker endpoints last updated on 2023-07-18
nginx_upstreams: nginx_upstreams:
synapse_main: synapse_main:
servers: servers:
@@ -46,7 +46,6 @@ nginx_upstreams:
- name: '~ ^/_matrix/client/v1/rooms/.*/hierarchy$' - name: '~ ^/_matrix/client/v1/rooms/.*/hierarchy$'
- name: '~ ^/_matrix/client/(v1|unstable)/rooms/.*/relations/' - name: '~ ^/_matrix/client/(v1|unstable)/rooms/.*/relations/'
- name: '~ ^/_matrix/client/v1/rooms/.*/threads$' - name: '~ ^/_matrix/client/v1/rooms/.*/threads$'
- name: '~ ^/_matrix/client/unstable/org.matrix.msc2716/rooms/.*/batch_send$'
- name: '~ ^/_matrix/client/unstable/im.nheko.summary/rooms/.*/summary$' - name: '~ ^/_matrix/client/unstable/im.nheko.summary/rooms/.*/summary$'
- name: '~ ^/_matrix/client/(r0|v3|unstable)/account/3pid$' - name: '~ ^/_matrix/client/(r0|v3|unstable)/account/3pid$'
- name: '~ ^/_matrix/client/(r0|v3|unstable)/account/whoami$' - name: '~ ^/_matrix/client/(r0|v3|unstable)/account/whoami$'

View File

@@ -0,0 +1,53 @@
---
argument_specs:
main:
short_description: Matrix Synaspe
description: "Installs and configures a synapse server. Supports workers and matrix_synapse_shared_secret_auth"
options:
synapse_psql_user:
description: Postgres database username for synapse
type: str
required: true
synapse_psql_pw:
description: Postgres database password for synapse
type: str
required: true
synapse_psql_db:
description: Postgres database name for synapse
type: str
required: false
default: "{{ synapse_psql_user }}"
synapse_psql_host:
description: Postgres database server hostname
type: str
required: false
default: localhost
matrix_max_upload_size_mb:
description: Maximum file upload size for synapse in megabytes
type: int
required: false
default: 100
matrix_auto_join_rooms:
description: A list of room aliases new users will be joined to automatically
type: list
required: false
default: []
matrix_signing_key:
description: Matrix federation signing key. Will use auto-generated one if not defined.
type: str
required: false
synapse_metrics:
description: Whether to enable prometheus metrics listener on port 9656
type: bool
required: false
default: false
synapse_presence:
description: Whether to enable presence detection on synapse. If disabled all users will be shown as permanently offline.
type: bool
required: false
default: true

View File

@@ -12,5 +12,3 @@ use_presence: {{ synapse_presence }}
enable_media_repo: {{ matrix_media_repo_server is not defined and 'media_repository' not in synapse_workers }} enable_media_repo: {{ matrix_media_repo_server is not defined and 'media_repository' not in synapse_workers }}
retention: retention:
enabled: true enabled: true
experimental_features:
msc2716_enabled: true

View File

@@ -18,9 +18,11 @@ update_user_directory_from_worker: user_dir-0
{% if 'event_persister' in synapse_workers or 'typing_persister' in synapse_workers or 'account_persister' in synapse_workers or 'device_persister' in synapse_workers or 'presence_persister' in synapse_workers or 'receipt_persister' in synapse_workers %} {% if 'event_persister' in synapse_workers or 'typing_persister' in synapse_workers or 'account_persister' in synapse_workers or 'device_persister' in synapse_workers or 'presence_persister' in synapse_workers or 'receipt_persister' in synapse_workers %}
instance_map: instance_map:
main:
host: localhost
port: 9093
{% for persister_type in persister_workers %} {% for persister_type in persister_workers %}
{% if persister_type in synapse_workers %} {% if persister_type in synapse_workers %}
{% for port in synapse_workers[persister_type] %} {% for port in synapse_workers[persister_type] %}
{{ persister_type }}-{{ loop.index0 }}: {{ persister_type }}-{{ loop.index0 }}:
@@ -28,7 +30,6 @@ instance_map:
port: {{ port }} port: {{ port }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
stream_writers: stream_writers:

View File

@@ -2,10 +2,6 @@
worker_app: synapse.app.{{ worker_app }} worker_app: synapse.app.{{ worker_app }}
worker_name: {{ worker }} worker_name: {{ worker }}
# The replication listener on the synapse to talk to.
worker_replication_host: 127.0.0.1
worker_replication_http_port: 9093
worker_log_config: /etc/matrix-synapse/worker-logs/{{ worker }}-log.yaml worker_log_config: /etc/matrix-synapse/worker-logs/{{ worker }}-log.yaml
{% if worker_port is defined and worker_listeners|length !=0 or synapse_metrics %} {% if worker_port is defined and worker_listeners|length !=0 or synapse_metrics %}
worker_listeners: worker_listeners: