Update to 2020-05-19 18:00

master
Daniel Berteaud 5 years ago
parent ec1b1ece11
commit 9cdb4c7413
  1. 6
      roles/matrix_synapse/defaults/main.yml
  2. 22
      roles/matrix_synapse/templates/homeserver.yaml.j2
  3. 1
      roles/pgadmin4/tasks/install.yml

@ -1,7 +1,7 @@
--- ---
# Synapse version to deploy # Synapse version to deploy
synapse_version: 1.12.4 synapse_version: 1.13.0
# Synapse install dir # Synapse install dir
synapse_root_dir: /opt/matrix/synapse synapse_root_dir: /opt/matrix/synapse
@ -54,10 +54,6 @@ synapse_federation_ip_blacklist:
- 169.254.0.0/16 - 169.254.0.0/16
# Limits # Limits
synapse_rc_message_per_sec: 30
synapse_rc_message_burst: 100.0
synapse_rc_login_per_sec: 3
synapse_rc_login_burst: 10
synapse_upload_max_size: 20M synapse_upload_max_size: 20M
# Registration settings # Registration settings

@ -24,9 +24,7 @@ listeners:
tls: true tls: true
x_forwarded: {{ ('0.0.0.0/0' in synapse_tls_src_ip) | ternary('False','True') }} x_forwarded: {{ ('0.0.0.0/0' in synapse_tls_src_ip) | ternary('False','True') }}
resources: resources:
- names: [ client ] - names: [ client, federation ]
compress: True
- names: [ federation ]
compress: False compress: False
{% endif %} {% endif %}
- port: {{ synapse_port }} - port: {{ synapse_port }}
@ -35,9 +33,7 @@ listeners:
tls: False tls: False
x_forwarded: {{ ('0.0.0.0/0' in synapse_src_ip) | ternary('False','True') }} x_forwarded: {{ ('0.0.0.0/0' in synapse_src_ip) | ternary('False','True') }}
resources: resources:
- names: [ client ] - names: [ client, federation ]
compress: {{ ('0.0.0.0/0' in synapse_src_ip) | ternary('True','False') }}
- names: [ federation ]
compress: False compress: False
database: database:
@ -75,20 +71,6 @@ federation_ip_range_blacklist:
federation_ip_range_blacklist: [] federation_ip_range_blacklist: []
{% endif %} {% endif %}
rc_message:
per_second: {{ synapse_rc_message_per_sec }}
burst_count: {{ synapse_rc_message_burst }}
rc_login:
address:
per_second: {{ synapse_rc_login_per_sec }}
burst_count: {{ synapse_rc_login_burst }}
account:
per_second: {{ synapse_rc_login_per_sec }}
burst_count: {{ synapse_rc_login_burst }}
failed_attempts:
per_second: {{ synapse_rc_login_per_sec }}
burst_count: {{ synapse_rc_login_burst }}
media_store_path: "{{ synapse_root_dir }}/media_store" media_store_path: "{{ synapse_root_dir }}/media_store"
uploads_path: "{{ synapse_root_dir }}/uploads" uploads_path: "{{ synapse_root_dir }}/uploads"
max_upload_size: "{{ synapse_upload_max_size }}" max_upload_size: "{{ synapse_upload_max_size }}"

@ -40,6 +40,7 @@
- futures - futures
- psycopg2 - psycopg2
- werkzeug==0.16.1 - werkzeug==0.16.1
- ldap3==2.6.1
state: latest state: latest
virtualenv: "{{ pga_root_dir }}" virtualenv: "{{ pga_root_dir }}"
virtualenv_command: /opt/rh/rh-python36/root/usr/bin/virtualenv virtualenv_command: /opt/rh/rh-python36/root/usr/bin/virtualenv

Loading…
Cancel
Save