diff --git a/inventory/host_vars/matrix.finallycoffee.eu/vars.yml b/inventory/host_vars/matrix.finallycoffee.eu/vars.yml index ad94dddb7..085520963 100644 --- a/inventory/host_vars/matrix.finallycoffee.eu/vars.yml +++ b/inventory/host_vars/matrix.finallycoffee.eu/vars.yml @@ -19,12 +19,22 @@ matrix_synapse_metrics_proxying_enabled: true matrix_base_data_path: "{{ vault_matrix_base_data_path }}" matrix_server_fqn_element: "chat.{{ matrix_domain }}" -matrix_docker_installation_enabled: false +matrix_playbook_docker_installation_enabled: false #matrix_client_element_version: v1.8.4 #matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:v1.7.21" -matrix_synapse_docker_image: "{{ matrix_synapse_docker_image_name_prefix }}matrixdotorg/synapse:v1.73.0" +#matrix_synapse_docker_image: "{{ matrix_synapse_docker_image_name_prefix }}matrixdotorg/synapse:v1.77.0" +#matrix_synapse_in_container_python_packages_path: "/usr/local/lib/python3.11/site-packages" +#matrix_synapse_default_room_version: "10" #matrix_mautrix_telegram_version: v0.10.0 +matrix_dimension_scheme: https + +devture_timesync_installation_enabled: false +matrix_playbook_reverse_proxy_type: playbook-managed-nginx +# per https://github.com/spantaleev/matrix-docker-ansible-deploy/blob/master/CHANGELOG.md#adapting-the-configuration-for-existing-synapse-installations +#matrix_homeserver_generic_secret_key: "{{ matrix_synapse_macaroon_secret_key }}" +matrix_homeserver_generic_secret_key: "{{ vault_homeserver_generic_secret_key }}" +devture_systemd_service_manager_up_verification_delay_seconds: 120 web_user: "web" revproxy_autoload_dir: "/vault/services/web/sites.d" @@ -34,9 +44,10 @@ postgres_dump_dir: /vault/temp # # General Synapse config # -matrix_postgres_connection_password: "{{ vault_matrix_postgres_connection_password }}" +#matrix_postgres_connection_password: "{{ vault_matrix_postgres_connection_password }}" +devture_postgres_connection_password: "{{ vault_matrix_postgres_connection_password }}" # A secret used to protect access keys issued by the server. -matrix_homeserver_generic_secret_key: "{{ vault_homeserver_generic_secret_key }}" +# matrix_homeserver_generic_secret_key: "{{ vault_homeserver_generic_secret_key }}" # Make synapse accept larger media aswell matrix_synapse_max_upload_size_mb: 200 # Enable metrics at (default) :9100/_synapse/metrics @@ -53,13 +64,33 @@ matrix_synapse_auto_join_rooms: ## Synapse rate limits matrix_synapse_rc_federation: window_size: 1000 - sleep_limit: 25 + sleep_limit: 50 sleep_delay: 500 reject_limit: 50 - concurrent: 5 + concurrent: 10 matrix_synapse_rc_message: per_second: 0.5 burst_count: 25 +matrix_synapse_rc_joins: + local: + per_second: 0.5 + burst_count: 20 + remote: + per_second: 0.05 + burst_count: 20 +matrix_synapse_rc_joins_per_room: + per_second: 1 + burst_count: 10 +matrix_synapse_rc_invites: + per_room: + per_second: 0.5 + burst_count: 10 + per_user: + per_second: 0.006 + burst_count: 10 + per_issuer: + per_second: 2 + burst_count: 20 ## Synapse cache tuning matrix_synapse_caches_global_factor: 1.5 @@ -270,7 +301,7 @@ matrix_mx_puppet_skype_container_http_monitoring_host_bind_port: 9405 # # mx-puppet-discord configuration # -matrix_mx_puppet_discord_enabled: true +matrix_mx_puppet_discord_enabled: false matrix_mx_puppet_discord_client_id: "{{ vault_matrix_mx_puppet_discord_client_id }}" matrix_mx_puppet_discord_client_secret: "{{ vault_matrix_mx_puppet_discord_client_secret }}" matrix_mx_puppet_discord_container_http_monitoring_host_bind_port: 9404 @@ -335,11 +366,11 @@ matrix_client_element_welcome_text: | matrix_client_element_welcome_logo: "welcome/images/logo.png" matrix_client_element_welcome_logo_link: "https://{{ matrix_domain }}" -matrix_client_element_branding_authHeaderLogoUrl: "welcome/images/logo.png" -matrix_client_element_branding_welcomeBackgroundUrl: "welcome/images/background.jpg" +matrix_client_element_branding_auth_header_logo_url: "welcome/images/logo.png" +matrix_client_element_branding_welcome_background_url: "welcome/images/background.jpg" matrix_client_element_container_extra_arguments: - - "-v {{ matrix_client_element_data_path }}/background.jpg:/app/{{ matrix_client_element_branding_welcomeBackgroundUrl }}:ro" - - "-v {{ matrix_client_element_data_path }}/logo.png:/app/{{ matrix_client_element_branding_authHeaderLogoUrl }}:ro" + - "-v {{ matrix_client_element_data_path }}/background.jpg:/app/{{ matrix_client_element_branding_welcome_background_url }}:ro" + - "-v {{ matrix_client_element_data_path }}/logo.png:/app/{{ matrix_client_element_branding_auth_header_logo_url }}:ro" # Integration and capabilites config matrix_client_element_integrations_ui_url: "https://{{ matrix_server_fqn_dimension }}/element" matrix_client_element_integrations_rest_url: "https://{{ matrix_server_fqn_dimension }}/api/v1/scalar" @@ -348,7 +379,7 @@ matrix_client_element_integrations_widgets_urls: - "https://scalar.vector.im/api" matrix_client_element_integrations_jitsi_widget_url: "https://{{ matrix_server_fqn_dimension }}/widgets/jitsi" matrix_client_element_disable_custom_urls: false -matrix_client_element_roomdir_servers: +matrix_client_element_room_directory_servers: - "matrix.org" - "finallycoffee.eu" - "entropia.de" diff --git a/inventory/hosts b/inventory/hosts index fea4f3152..8e7f3f957 100644 --- a/inventory/hosts +++ b/inventory/hosts @@ -1,22 +1,24 @@ $ANSIBLE_VAULT;1.1;AES256 -31336566376336626265653165306635633033376662656164383037383834653239656136333734 -3833666339393037323035343565343235396163636166370a643933333933386133366564396465 -30393637613164356564393337633361653432333232383664303739363736633435363764343530 -3532313739363963660a343434356534316230623133636366386334323465376139363162616238 -39396638366262313531653635326361616537396338363533303961623165343931373939306239 -31336632643166633662653765333231393461643933306464303165633037343061323636313034 -34376631656563646665373566633431366638383863666130323264316337663237343135306236 -66323536346164663239343139623430303230333466633437643337343930363530653964626163 -38336363633730393136333637383631636266396636646533356262376630646139303636666538 -32366437353163663865623234643061313639646162643965393535353938313133326237313265 -66646163333535396539646461356334633532313530653834623263386265383765356130333466 -30373531306137393935363030313739666536363138363962646565306439393239303030643162 -33333166663430393866666439653532623034396130313066383035396535646633366237303264 -36356665366461323664373038366364623937386233313039323837666333653764616462333365 -31326264633236373937313537633961633164323138356135633765663639323537656263633766 -38653836323263386333376131333330326237393666363064326463663961633839393039323835 -61306265333232623037356465393133323733363634646364336261326333366239346565366338 -61646132333033373866623739343830336164316461646366666237313565626639323537623732 -38323830656136323137323530343764666433633432366136643538323832653130376363653135 -64376261386635636533353961613335663962306337353866616464613636303735336230623962 -3336 +34373565633762393838366465623964356238366661386638373937363563613036646662333330 +3436326333353462346464656136363131376565386433620a613965643930313137353134616134 +39656164373331383333613630323531646132626263626661313735313136326132343866313733 +3737323866333566320a376564393337306438636261393535623435326139393830613765646630 +63363538343963636231623031346539363937383363376133333562376339343361303337343133 +39323431653963613134376465333762653038393839313137323832313633343639623665393263 +34623034353564613665333037366231613261343336613730666130396437363332373463313137 +39326237626130323336626265653431383332303065323536316634353735313565633862633937 +65303032306434663962653866366538636133623530343836633233636664386230366165356462 +35623536356462623261666533626436613465346461313733356531386338626263376561363131 +30373534653437363165623138656636323638393734323836396536336364376131333066343432 +38653564623432623461353266623263643430383965373138663361646665616566613337663837 +63343766303936383330643561356233333961303436656564363061393136356163393463383033 +66343034633230373362343332613338646537353934373264633965636431373630326632356535 +36393363356261616234386266333462373065646436653430653561366330353732616135346165 +30306164633666666339336261306264306133616263623430376536346364306336373332326463 +37333735376365373536613734653961326434653665356436323635373863636266663130303431 +39396534633064383566306133363431323537313639383464303433373761363333303936626366 +37383637336631663931303265393562356336623861613161663738393038353263616662633634 +37373932306261666531303265646365323464363930313238343537343433636639383764343139 +35303831646166376365363536656239346630346561356464653362363637306234353761653432 +61323865663266613433343639343762363437333562346633396462623436346364363033383739 +646230333738313565356339346435656331 diff --git a/roles/custom/matrix-client-element/tasks/setup_install.yml b/roles/custom/matrix-client-element/tasks/setup_install.yml index 0b31debe6..25828ef90 100644 --- a/roles/custom/matrix-client-element/tasks/setup_install.yml +++ b/roles/custom/matrix-client-element/tasks/setup_install.yml @@ -100,7 +100,8 @@ with_items: - {src: "{{ role_path }}/files/background.jpg", name: "background.jpg"} - {src: "{{ role_path }}/files/antifa_coffee_cups.png", name: "logo.png"} - when: "matrix_client_element_enabled|bool and item.src is not none" + when: false + #when: "matrix_client_element_enabled|bool and item.src is not none" - name: Ensure Element config files removed ansible.builtin.file: