diff --git a/roles/matrix_synapse/defaults/main.yml b/roles/matrix_synapse/defaults/main.yml index ebbaa74..c748348 100644 --- a/roles/matrix_synapse/defaults/main.yml +++ b/roles/matrix_synapse/defaults/main.yml @@ -1,7 +1,7 @@ --- # Synapse version to deploy -synapse_version: 1.12.4 +synapse_version: 1.13.0 # Synapse install dir synapse_root_dir: /opt/matrix/synapse @@ -54,10 +54,6 @@ synapse_federation_ip_blacklist: - 169.254.0.0/16 # 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 # Registration settings diff --git a/roles/matrix_synapse/templates/homeserver.yaml.j2 b/roles/matrix_synapse/templates/homeserver.yaml.j2 index 89ba567..720bd4b 100644 --- a/roles/matrix_synapse/templates/homeserver.yaml.j2 +++ b/roles/matrix_synapse/templates/homeserver.yaml.j2 @@ -24,9 +24,7 @@ listeners: tls: true x_forwarded: {{ ('0.0.0.0/0' in synapse_tls_src_ip) | ternary('False','True') }} resources: - - names: [ client ] - compress: True - - names: [ federation ] + - names: [ client, federation ] compress: False {% endif %} - port: {{ synapse_port }} @@ -35,9 +33,7 @@ listeners: tls: False x_forwarded: {{ ('0.0.0.0/0' in synapse_src_ip) | ternary('False','True') }} resources: - - names: [ client ] - compress: {{ ('0.0.0.0/0' in synapse_src_ip) | ternary('True','False') }} - - names: [ federation ] + - names: [ client, federation ] compress: False database: @@ -75,20 +71,6 @@ federation_ip_range_blacklist: federation_ip_range_blacklist: [] {% 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" uploads_path: "{{ synapse_root_dir }}/uploads" max_upload_size: "{{ synapse_upload_max_size }}" diff --git a/roles/pgadmin4/tasks/install.yml b/roles/pgadmin4/tasks/install.yml index 41cdf66..84a8437 100644 --- a/roles/pgadmin4/tasks/install.yml +++ b/roles/pgadmin4/tasks/install.yml @@ -40,6 +40,7 @@ - futures - psycopg2 - werkzeug==0.16.1 + - ldap3==2.6.1 state: latest virtualenv: "{{ pga_root_dir }}" virtualenv_command: /opt/rh/rh-python36/root/usr/bin/virtualenv