From d2076ad64a8592fe47f9591755be6a811c536ff3 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 10 Jun 2020 10:00:15 +0200 Subject: [PATCH] Update to 2020-06-10 10:00 --- roles/jitsi/defaults/main.yml | 4 ++-- roles/lemonldap_ng/templates/llng-fastcgi-server.service.j2 | 4 ++-- roles/matrix_riot/templates/config.json.j2 | 11 +++++++++-- roles/matrix_synapse/defaults/main.yml | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/roles/jitsi/defaults/main.yml b/roles/jitsi/defaults/main.yml index 3cd4f22..a67091a 100644 --- a/roles/jitsi/defaults/main.yml +++ b/roles/jitsi/defaults/main.yml @@ -139,8 +139,8 @@ jitsi_meet_interface_conf_base: - profile - info - chat - - recording - - livestreaming + #- recording + #- livestreaming - etherpad - sharedvideo - settings diff --git a/roles/lemonldap_ng/templates/llng-fastcgi-server.service.j2 b/roles/lemonldap_ng/templates/llng-fastcgi-server.service.j2 index 7111790..18ae457 100644 --- a/roles/lemonldap_ng/templates/llng-fastcgi-server.service.j2 +++ b/roles/lemonldap_ng/templates/llng-fastcgi-server.service.j2 @@ -9,7 +9,7 @@ User=apache Group=apache Environment=PM_MAX_REQUESTS=5000 Environment=PM_SIZECHECK_NUM_REQUESTS=100 -Environment=PM_MAX_SIZE=400000 +Environment=PM_MAX_SIZE=800000 Environment=SOCKET=/var/run/llng-fastcgi-server/llng-fastcgi.sock Environment=PID=/var/run/llng-fastcgi-server/llng-fastcgi-server.pid Environment=PERL_LWP_ENV_PROXY={{ llng_reload_use_proxy | ternary('1','0') }} @@ -21,7 +21,7 @@ PrivateDevices=yes ProtectSystem=full ProtectHome=yes NoNewPrivileges=yes -MemoryLimit=2048M +MemoryLimit=3072M Restart=on-failure StartLimitInterval=0 RestartSec=1 diff --git a/roles/matrix_riot/templates/config.json.j2 b/roles/matrix_riot/templates/config.json.j2 index 2b801cd..860539c 100644 --- a/roles/matrix_riot/templates/config.json.j2 +++ b/roles/matrix_riot/templates/config.json.j2 @@ -2,8 +2,15 @@ "default_hs_url": "{{ riot_default_home_server | default('https://' + synapse_server_name) | default('https://matrix.org') }}", "default_is_url": "{{ riot_default_identity_server }}", "brand": "Riot", - "integrations_ui_url": "", - "integrations_rest_url": "", + "integrations_ui_url": "https://scalar.vector.im/", + "integrations_rest_url": "https://scalar.vector.im/api", + "integrations_widgets_urls": [ + "https://scalar.vector.im/_matrix/integrations/v1", + "https://scalar.vector.im/api", + "https://scalar-staging.vector.im/_matrix/integrations/v1", + "https://scalar-staging.vector.im/api", + "https://scalar-staging.riot.im/scalar/api" + ], "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "enableLabs": true, "roomDirectory": { diff --git a/roles/matrix_synapse/defaults/main.yml b/roles/matrix_synapse/defaults/main.yml index e7685cb..dce539e 100644 --- a/roles/matrix_synapse/defaults/main.yml +++ b/roles/matrix_synapse/defaults/main.yml @@ -94,7 +94,7 @@ synapse_app_name: Matrix #synapse_riot_base_url: https://messenger.example.com # Log level -synapse_log_level: ERROR +synapse_log_level: INFO # Can be internal, ldap, rest or oidc synapse_auth: internal