refactor: remove signalgo and update signal to 'after merge'

roles/custom/matrix-bridge-mautrix-signal/tasks/inject_into_nginx_proxy.yml

@@ -3,7 +3,7 @@
 - name: Fail if matrix-nginx-proxy role already executed
   ansible.builtin.fail:
     msg: >-
-      Trying to append mautrix-whatapp-metrics's reverse-proxying configuration to matrix-nginx-proxy,
+      Trying to append mautrix-signal-metrics's reverse-proxying configuration to matrix-nginx-proxy,
       but it's pointless since the matrix-nginx-proxy role had already executed.
       To fix this, please change the order of roles in your playbook,
       so that the matrix-nginx-proxy role would run after the matrix-bridge-mautrix-signal role.
@@ -18,7 +18,7 @@
             {% if matrix_nginx_proxy_enabled | default(False) %}
               {# Use the embedded DNS resolver in Docker containers to discover the service #}
               resolver 127.0.0.11 valid=5s;
-              set $backend "matrix-mautrix-signal:8000";
+              set $backend "matrix-mautrix-signal:8001";
               proxy_pass http://$backend/metrics;
             {% else %}
               return 404 "matrix-nginx-proxy is disabled and no host port was bound to the container, so metrics are unavailable";

roles/custom/matrix-bridge-mautrix-signal/tasks/setup_install.yml

@@ -1,30 +1,71 @@
 ---
 
-- name: Ensure Mautrix Signal image is pulled
+- ansible.builtin.set_fact:
+    matrix_mautrix_signal_requires_restart: false
+
+- when: "matrix_mautrix_signal_database_engine == 'postgres'"
+  block:
+    - name: Check if an SQLite database already exists
+      ansible.builtin.stat:
+        path: "{{ matrix_mautrix_signal_sqlite_database_path_local }}"
+      register: matrix_mautrix_signal_sqlite_database_path_local_stat_result
+
+    - when: "matrix_mautrix_signal_sqlite_database_path_local_stat_result.stat.exists | bool"
+      block:
+        - ansible.builtin.include_role:
+            name: galaxy/com.devture.ansible.role.postgres
+            tasks_from: migrate_db_to_postgres
+          vars:
+            devture_postgres_db_migration_request:
+              src: "{{ matrix_mautrix_signal_sqlite_database_path_local }}"
+              dst: "{{ matrix_mautrix_signal_database_connection_string }}"
+              caller: "{{ role_path | basename }}"
+              engine_variable_name: 'matrix_mautrix_signal_database_engine'
+              engine_old: 'sqlite'
+              systemd_services_to_stop: ['matrix-mautrix-signal.service']
+              pgloader_options: ['--with "quote identifiers"']
+
+        - ansible.builtin.set_fact:
+            matrix_mautrix_signal_requires_restart: true
+
+- name: Ensure Mautrix signal paths exists
+  ansible.builtin.file:
+    path: "{{ item.path }}"
+    state: directory
+    mode: 0750
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+  with_items:
+    - {path: "{{ matrix_mautrix_signal_base_path }}", when: true}
+    - {path: "{{ matrix_mautrix_signal_config_path }}", when: true}
+    - {path: "{{ matrix_mautrix_signal_data_path }}", when: true}
+    - {path: "{{ matrix_mautrix_signal_docker_src_files_path }}", when: "{{ matrix_mautrix_signal_container_image_self_build }}"}
+  when: item.when | bool
+
+- name: Ensure Mautrix signal image is pulled
   community.docker.docker_image:
     name: "{{ matrix_mautrix_signal_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_signal_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mautrix_signal_docker_image_force_pull }}"
-  when: "not matrix_mautrix_signal_container_image_self_build | bool"
+  when: not matrix_mautrix_signal_container_image_self_build
   register: result
   retries: "{{ devture_playbook_help_container_retries_count }}"
   delay: "{{ devture_playbook_help_container_retries_delay }}"
   until: result is not failed
 
-
-- name: Ensure Mautrix Signal repository is present on self-build
+- name: Ensure Mautrix signal repository is present on self-build
   ansible.builtin.git:
-    repo: "{{ matrix_mautrix_signal_docker_repo }}"
-    version: "{{ matrix_mautrix_signal_docker_repo_version }}"
+    repo: "{{ matrix_mautrix_signal_container_image_self_build_repo }}"
     dest: "{{ matrix_mautrix_signal_docker_src_files_path }}"
+    version: "{{ matrix_mautrix_signal_container_image_self_build_branch }}"
     force: "yes"
   become: true
   become_user: "{{ matrix_user_username }}"
   register: matrix_mautrix_signal_git_pull_results
   when: "matrix_mautrix_signal_container_image_self_build | bool"
 
-- name: Ensure Mautrix Signal image is built
+- name: Ensure Mautrix signal Docker image is built
   community.docker.docker_image:
     name: "{{ matrix_mautrix_signal_docker_image }}"
     source: build
@@ -36,62 +77,38 @@
       pull: true
   when: "matrix_mautrix_signal_container_image_self_build | bool"
 
+- name: Check if an old database file exists
+  ansible.builtin.stat:
+    path: "{{ matrix_mautrix_signal_base_path }}/mautrix-signal.db"
+  register: matrix_mautrix_signal_stat_database
 
-- name: Ensure Mautrix Signal Daemon image is pulled
-  community.docker.docker_image:
-    name: "{{ matrix_mautrix_signal_daemon_docker_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_signal_daemon_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
-    force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mautrix_signal_daemon_docker_image_force_pull }}"
-  when: matrix_mautrix_signal_enabled and not matrix_mautrix_signal_daemon_container_image_self_build | bool
-  register: matrix_mautrix_signal_daemon_pull_results
+- name: Check if an old matrix state file exists
+  ansible.builtin.stat:
+    path: "{{ matrix_mautrix_signal_base_path }}/mx-state.json"
+  register: matrix_mautrix_signal_stat_mx_state
 
-- name: Ensure Mautrix Signal Daemon repository is present on self-build
-  ansible.builtin.git:
-    repo: "{{ matrix_mautrix_signal_daemon_docker_repo }}"
-    version: "{{ matrix_mautrix_signal_daemon_docker_repo_version }}"
-    dest: "{{ matrix_mautrix_signal_daemon_docker_src_files_path }}"
-    force: "yes"
-  become: true
-  become_user: "{{ matrix_user_username }}"
-  register: matrix_mautrix_signal_daemon_git_pull_results
-  when: "matrix_mautrix_signal_daemon_container_image_self_build | bool"
+- name: (Data relocation) Ensure matrix-mautrix-signal.service is stopped
+  ansible.builtin.service:
+    name: matrix-mautrix-signal
+    state: stopped
+    enabled: false
+    daemon_reload: true
+  failed_when: false
+  when: "matrix_mautrix_signal_stat_database.stat.exists"
 
-- name: Ensure Mautrix Signal Daemon image is built
-  community.docker.docker_image:
-    name: "{{ matrix_mautrix_signal_daemon_docker_image }}"
-    source: build
-    force_source: "{{ matrix_mautrix_signal_daemon_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
-    force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mautrix_signal_daemon_git_pull_results.changed }}"
-    build:
-      dockerfile: Containerfile
-      path: "{{ matrix_mautrix_signal_daemon_docker_src_files_path }}"
-      pull: true
-  when: "matrix_mautrix_signal_daemon_container_image_self_build | bool"
+- name: (Data relocation) Move mautrix-signal database file to ./data directory
+  ansible.builtin.command:
+    cmd: "mv {{ matrix_mautrix_signal_base_path }}/mautrix-signal.db {{ matrix_mautrix_signal_data_path }}/mautrix-signal.db"
+    creates: "{{ matrix_mautrix_signal_data_path }}/mautrix-signal.db"
+    removes: "{{ matrix_mautrix_signal_base_path }}/mautrix-signal.db"
+  when: "matrix_mautrix_signal_stat_database.stat.exists"
 
-- name: Ensure Mautrix Signal paths exist
-  ansible.builtin.file:
-    path: "{{ item }}"
-    state: directory
-    mode: 0750
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_groupname }}"
-  with_items:
-    - "{{ matrix_mautrix_signal_base_path }}"
-    - "{{ matrix_mautrix_signal_config_path }}"
-    - "{{ matrix_mautrix_signal_daemon_path }}"
-    - "{{ matrix_mautrix_signal_daemon_path }}/avatars"
-    - "{{ matrix_mautrix_signal_daemon_path }}/attachments"
-    - "{{ matrix_mautrix_signal_daemon_path }}/data"
-
-
-- name: Ensure mautrix-signal-daemon environment variables file created
-  ansible.builtin.template:
-    src: "{{ role_path }}/templates/env.j2"
-    dest: "{{ matrix_mautrix_signal_daemon_path }}/env"
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_groupname }}"
-    mode: 0644
+- name: (Data relocation) Move mautrix-signal mx-state file to ./data directory
+  ansible.builtin.command:
+    cmd: "mv {{ matrix_mautrix_signal_base_path }}/mx-state.json {{ matrix_mautrix_signal_data_path }}/mx-state.json"
+    creates: "{{ matrix_mautrix_signal_data_path }}/mx-state.json"
+    removes: "{{ matrix_mautrix_signal_base_path }}/mx-state.json"
+  when: "matrix_mautrix_signal_stat_mx_state.stat.exists"
 
 - name: Ensure mautrix-signal config.yaml installed
   ansible.builtin.copy:
@@ -109,15 +126,15 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
 
-- name: Ensure matrix-mautrix-signal-daemon.service installed
-  ansible.builtin.template:
-    src: "{{ role_path }}/templates/systemd/matrix-mautrix-signal-daemon.service.j2"
-    dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-signal-daemon.service"
-    mode: 0644
-  register: matrix_mautrix_signal_daemon_systemd_service_result
-
 - name: Ensure matrix-mautrix-signal.service installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/systemd/matrix-mautrix-signal.service.j2"
     dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-signal.service"
     mode: 0644
+
+- name: Ensure matrix-mautrix-signal.service restarted, if necessary
+  ansible.builtin.service:
+    name: "matrix-mautrix-signal.service"
+    state: restarted
+    daemon_reload: true
+  when: "matrix_mautrix_signal_requires_restart | bool"

roles/custom/matrix-bridge-mautrix-signal/tasks/setup_uninstall.yml

@@ -1,26 +1,5 @@
 ---
 
-# Signal daemon service
-- name: Check existence of matrix-mautrix-signal-daemon service
-  ansible.builtin.stat:
-    path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-signal-daemon.service"
-  register: matrix_mautrix_signal_daemon_service_stat
-
-- when: matrix_mautrix_signal_daemon_service_stat.stat.exists | bool
-  block:
-    - name: Ensure matrix-mautrix-signal-daemon is stopped
-      ansible.builtin.service:
-        name: matrix-mautrix-signal-daemon
-        state: stopped
-        enabled: false
-        daemon_reload: true
-
-    - name: Ensure matrix-mautrix-signal-daemon.service doesn't exist
-      ansible.builtin.file:
-        path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-signal-daemon.service"
-        state: absent
-
-# Bridge service
 - name: Check existence of matrix-mautrix-signal service
   ansible.builtin.stat:
     path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-signal.service"

roles/custom/matrix-bridge-mautrix-signal/tasks/validate_config.yml

@@ -6,35 +6,15 @@
       You need to define a required configuration setting (`{{ item.name }}`).
   when: "item.when | bool and vars[item.name] == ''"
   with_items:
-    - {'name': 'matrix_mautrix_signal_homeserver_domain', when: true}
-    - {'name': 'matrix_mautrix_signal_homeserver_address', when: true}
-    - {'name': 'matrix_mautrix_signal_homeserver_token', when: true}
     - {'name': 'matrix_mautrix_signal_appservice_token', when: true}
+    - {'name': 'matrix_mautrix_signal_homeserver_token', when: true}
     - {'name': 'matrix_mautrix_signal_database_hostname', when: "{{ matrix_mautrix_signal_database_engine == 'postgres' }}"}
 
-- name: (Deprecation) Fail if matrix_mautrix_signal_bridge_permissions specified as YAML string, instead of a dictionary
-  ansible.builtin.fail:
-    msg: >-
-      The `matrix_mautrix_signal_bridge_permissions` variable in your configuration is specified as a YAML string.
-      The playbook now expects a hashmap/dictionary in this variable.
-      Change your configuration like this:
-      matrix_mautrix_signal_bridge_permissions: {{ matrix_mautrix_signal_bridge_permissions | from_yaml | to_json }}
-  when: "matrix_mautrix_signal_bridge_permissions is string"
-
-- name: (Deprecation) Catch and report renamed Signal variables
+- name: (Deprecation) Catch and report renamed settings
   ansible.builtin.fail:
     msg: >-
       Your configuration contains a variable, which now has a different name.
       Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`).
   when: "item.old in vars"
   with_items:
-    - {'old': 'matrix_mautrix_signal_container_exposed_port_number', 'new': '<superseded by matrix_mautrix_signal_container_http_host_bind_port>'}
-    - {'old': 'matrix_mautrix_signal_db_user', 'new': 'matrix_mautrix_signal_database_username'}
-    - {'old': 'matrix_mautrix_signal_db_password', 'new': 'matrix_mautrix_signal_database_password'}
-    - {'old': 'matrix_mautrix_signal_db_database', 'new': 'matrix_mautrix_signal_database_name'}
-    - {'old': 'matrix_mautrix_signal_db_host', 'new': 'matrix_mautrix_signal_database_hostname'}
-    - {'old': 'matrix_mautrix_signal_db_port', 'new': 'matrix_mautrix_signal_database_port'}
-    - {'old': 'matrix_mautrix_signal_db_url', 'new': 'matrix_mautrix_signal_database_connection_string'}
-    - {'old': 'matrix_mautrix_signal_configuration_permissions', 'new': '<superseded by matrix_mautrix_signal_configuration_extension_yaml>'}
-    - {'old': 'matrix_mautrix_signal_container_self_build', 'new': 'matrix_mautrix_signal_container_image_self_build'}
-    - {'old': 'matrix_mautrix_signal_daemon_container_self_build', 'new': 'matrix_mautrix_signal_daemon_container_image_self_build'}
+    - {'old': 'matrix_mautrix_signal_log_level', 'new': 'matrix_mautrix_signal_logging_level'}