From 150a40ec26e1a711e2ce9a3c97415c9460551a47 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 8 Jan 2024 17:16:32 +0200 Subject: [PATCH] Move matrix-bridge-mx-puppet-instagram to its own container network --- group_vars/matrix_servers | 25 +++++++++++++------ .../defaults/main.yml | 14 ++++++++++- .../tasks/setup_install.yml | 5 ++++ .../tasks/validate_config.yml | 1 + .../templates/config.yaml.j2 | 4 +-- .../matrix-mx-puppet-instagram.service.j2 | 16 +++++++++--- 6 files changed, 50 insertions(+), 15 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 58a80e4b3..b53cbd850 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -1816,17 +1816,24 @@ matrix_mx_puppet_twitter_database_password: "{{ '%s' | format(matrix_homeserver_ # We don't enable bridges by default. matrix_mx_puppet_instagram_enabled: false +matrix_mx_puppet_instagram_systemd_required_services_list_auto: | + {{ + matrix_addons_homeserver_systemd_services_list + + + ([devture_postgres_identifier ~ '.service'] if (devture_postgres_enabled and matrix_mx_puppet_instagram_database_hostname == devture_postgres_connection_hostname) else []) + }} + matrix_mx_puppet_instagram_container_image_self_build: "{{ matrix_architecture != 'amd64' }}" -matrix_mx_puppet_instagram_systemd_required_services_list: | +matrix_mx_puppet_instagram_container_network: "{{ matrix_addons_container_network }}" + +matrix_mx_puppet_instagram_container_additional_networks_auto: |- {{ - ['docker.service'] - + - ['matrix-' + matrix_homeserver_implementation + '.service'] - + - ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled else []) - + - (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else []) + ( + ([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network]) + + + ([devture_postgres_container_network] if (devture_postgres_enabled and matrix_mx_puppet_instagram_database_hostname == devture_postgres_connection_hostname and matrix_mx_puppet_instagram_container_network != devture_postgres_container_network) else []) + ) | unique }} matrix_mx_puppet_instagram_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'mxig.as.tok', rounds=655555) | to_uuid }}" @@ -1836,6 +1843,8 @@ matrix_mx_puppet_instagram_homeserver_token: "{{ '%s' | format(matrix_homeserver matrix_mx_puppet_instagram_login_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret if matrix_synapse_ext_password_provider_shared_secret_auth_enabled else '' }}" +matrix_mx_puppet_instagram_presence_enabled: "{{ matrix_homeserver_implementation != 'synapse' or matrix_synapse_presence_enabled }}" + # Postgres is the default, except if not using internal Postgres server matrix_mx_puppet_instagram_database_engine: "{{ 'postgres' if devture_postgres_enabled else 'sqlite' }}" matrix_mx_puppet_instagram_database_hostname: "{{ devture_postgres_connection_hostname if devture_postgres_enabled else '' }}" diff --git a/roles/custom/matrix-bridge-mx-puppet-instagram/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-instagram/defaults/main.yml index ed8789903..8816b6707 100644 --- a/roles/custom/matrix-bridge-mx-puppet-instagram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-instagram/defaults/main.yml @@ -35,11 +35,20 @@ matrix_mx_puppet_instagram_provisioning_whitelist: # "@.*:yourserver.com" disallow users on a specific homeserver matrix_mx_puppet_instagram_provisioning_blacklist: [] +matrix_mx_puppet_instagram_container_network: "" + +matrix_mx_puppet_instagram_container_additional_networks: "{{ matrix_mx_puppet_instagram_container_additional_networks_auto + matrix_mx_puppet_instagram_container_additional_networks_custom }}" +matrix_mx_puppet_instagram_container_additional_networks_auto: [] +matrix_mx_puppet_instagram_container_additional_networks_custom: [] + # A list of extra arguments to pass to the container matrix_mx_puppet_instagram_container_extra_arguments: [] # List of systemd services that matrix-puppet-instagram.service depends on. -matrix_mx_puppet_instagram_systemd_required_services_list: ['docker.service'] +matrix_mx_puppet_instagram_systemd_required_services_list: "{{ matrix_mx_puppet_instagram_systemd_required_services_list_default + matrix_mx_puppet_instagram_systemd_required_services_list_auto + matrix_mx_puppet_instagram_systemd_required_services_list_custom }}" +matrix_mx_puppet_instagram_systemd_required_services_list_default: ['docker.service'] +matrix_mx_puppet_instagram_systemd_required_services_list_auto: [] +matrix_mx_puppet_instagram_systemd_required_services_list_custom: [] # List of systemd services that matrix-puppet-instagram.service wants matrix_mx_puppet_instagram_systemd_wanted_services_list: [] @@ -50,6 +59,9 @@ matrix_mx_puppet_instagram_homeserver_token: '' # Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth). matrix_mx_puppet_instagram_login_shared_secret: '' +matrix_mx_puppet_instagram_presence_enabled: true +matrix_mx_puppet_instagram_presence_interval: 5000 + matrix_mx_puppet_instagram_database_engine: sqlite matrix_mx_puppet_instagram_sqlite_database_path_local: "{{ matrix_mx_puppet_instagram_data_path }}/database.db" diff --git a/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/setup_install.yml b/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/setup_install.yml index be68d9fc1..ebd37688a 100644 --- a/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/setup_install.yml @@ -92,6 +92,11 @@ owner: "{{ matrix_user_username }}" group: "{{ matrix_user_groupname }}" +- name: Ensure mx-puppet-instagram container network is created + community.general.docker_network: + name: "{{ matrix_mx_puppet_instagram_container_network }}" + driver: bridge + - name: Ensure matrix-mx-puppet-instagram.service installed ansible.builtin.template: src: "{{ role_path }}/templates/systemd/matrix-mx-puppet-instagram.service.j2" diff --git a/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/validate_config.yml b/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/validate_config.yml index 7862f3860..67a2c6978 100644 --- a/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/validate_config.yml +++ b/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/validate_config.yml @@ -10,3 +10,4 @@ - {'name': 'matrix_mx_puppet_instagram_homeserver_address', when: true} - {'name': 'matrix_mx_puppet_instagram_homeserver_token', when: true} - {'name': 'matrix_mx_puppet_instagram_database_hostname', when: "{{ matrix_mx_puppet_instagram_database_engine == 'postgres' }}"} + - {'name': 'matrix_mx_puppet_instagram_container_network', when: true} diff --git a/roles/custom/matrix-bridge-mx-puppet-instagram/templates/config.yaml.j2 b/roles/custom/matrix-bridge-mx-puppet-instagram/templates/config.yaml.j2 index 57c5b0f0e..67b767ebb 100644 --- a/roles/custom/matrix-bridge-mx-puppet-instagram/templates/config.yaml.j2 +++ b/roles/custom/matrix-bridge-mx-puppet-instagram/templates/config.yaml.j2 @@ -16,9 +16,9 @@ bridge: presence: # Bridge Instagram online/offline status - enabled: true + enabled: {{ matrix_mx_puppet_instagram_presence_enabled | to_json }} # How often to send status to the homeserver in milliseconds - interval: 5000 + interval: {{ matrix_mx_puppet_instagram_presence_interval | to_json }} provisioning: # Regex of Matrix IDs allowed to use the puppet bridge diff --git a/roles/custom/matrix-bridge-mx-puppet-instagram/templates/systemd/matrix-mx-puppet-instagram.service.j2 b/roles/custom/matrix-bridge-mx-puppet-instagram/templates/systemd/matrix-mx-puppet-instagram.service.j2 index b667c6500..a4357b00a 100644 --- a/roles/custom/matrix-bridge-mx-puppet-instagram/templates/systemd/matrix-mx-puppet-instagram.service.j2 +++ b/roles/custom/matrix-bridge-mx-puppet-instagram/templates/systemd/matrix-mx-puppet-instagram.service.j2 @@ -19,20 +19,28 @@ ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_s # Intentional delay, so that the homeserver (we likely depend on) can manage to start. ExecStartPre={{ matrix_host_command_sleep }} 5 -ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-mx-puppet-instagram \ +ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ + --rm \ + --name=matrix-mx-puppet-instagram \ --log-driver=none \ --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ --cap-drop=ALL \ - --network={{ matrix_docker_network }} \ + --network={{ matrix_mx_puppet_instagram_container_network }} \ -e CONFIG_PATH=/config/config.yaml \ -e REGISTRATION_PATH=/config/registration.yaml \ - -v {{ matrix_mx_puppet_instagram_config_path }}:/config:z \ - -v {{ matrix_mx_puppet_instagram_data_path }}:/data:z \ + --mount type=bind,src={{ matrix_mx_puppet_instagram_config_path }},dst=/config \ + --mount type=bind,src={{ matrix_mx_puppet_instagram_data_path }},dst=/data \ {% for arg in matrix_mx_puppet_instagram_container_extra_arguments %} {{ arg }} \ {% endfor %} {{ matrix_mx_puppet_instagram_docker_image }} +{% for network in matrix_mx_puppet_instagram_container_additional_networks %} +ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mx-puppet-instagram +{% endfor %} + +ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-mx-puppet-instagram + ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-mx-puppet-instagram 2>/dev/null || true' ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-mx-puppet-instagram 2>/dev/null || true' Restart=always