made the bridge use the default postgres db

This commit is contained in:
Sabine Laszakovits
2021-01-02 00:39:11 +01:00
parent a06c58c753
commit ffb837d4bc
7 changed files with 39 additions and 88 deletions

View File

@ -22,13 +22,6 @@
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_docker_image_force_pull }}"
- name: Ensure Mautrix Signal database image is pulled
docker_image:
name: "{{ matrix_mautrix_signal_db_docker_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_mautrix_signal_db_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 }}"
- name: Ensure Mautrix Signal paths exist
file:
path: "{{ item }}"
@ -40,7 +33,6 @@
- "{{ matrix_mautrix_signal_base_path }}"
- "{{ matrix_mautrix_signal_config_path }}"
- "{{ matrix_mautrix_signal_daemon_path }}"
- "{{ matrix_mautrix_signal_db_storage_path }}"
- name: Ensure mautrix-signal config.yaml installed
copy:
@ -65,13 +57,6 @@
mode: 0644
register: matrix_mautrix_signal_daemon_systemd_service_result
- name: Ensure matrix-mautrix-signal-db.service installed
template:
src: "{{ role_path }}/templates/systemd/matrix-mautrix-signal-db.service.j2"
dest: "{{ matrix_systemd_path }}/matrix-mautrix-signal-db.service"
mode: 0644
register: matrix_mautrix_signal_db_systemd_service_result
- name: Ensure matrix-mautrix-signal.service installed
template:
src: "{{ role_path }}/templates/systemd/matrix-mautrix-signal.service.j2"
@ -82,4 +67,4 @@
- name: Ensure systemd reloaded after matrix-mautrix-signal.service installation
service:
daemon_reload: yes
when: "matrix_mautrix_signal_systemd_service_result.changed or matrix_mautrix_signal_daemon_systemd_service_result.changed or matrix_mautrix_signal_db_systemd_service_result.changed"
when: "matrix_mautrix_signal_systemd_service_result.changed or matrix_mautrix_signal_daemon_systemd_service_result.changed"

View File

@ -1,24 +1,5 @@
---
# Signal database service
- name: Check existence of matrix-mautrix-signal-db service
stat:
path: "{{ matrix_systemd_path }}/matrix-mautrix-signal-db.service"
register: matrix_mautrix_signal_db_service_stat
- name: Ensure matrix-mautrix-signal-db is stopped
service:
name: matrix-mautrix-signal-db
state: stopped
daemon_reload: yes
when: "matrix_mautrix_signal_db_service_stat.stat.exists"
- name: Ensure matrix-mautrix-signal-db.service doesn't exist
file:
path: "{{ matrix_systemd_path }}/matrix-mautrix-signal-db.service"
state: absent
when: "matrix_mautrix_signal_db_service_stat.stat.exists"
# Signal daemon service
- name: Check existence of matrix-mautrix-signal-daemon service
stat:
@ -61,4 +42,4 @@
- name: Ensure systemd reloaded after matrix-mautrix-signal_X.service removal
service:
daemon_reload: yes
when: "matrix_mautrix_signal_service_stat.stat.exists or matrix_mautrix_signal_daemon_service_stat.stat.exists or matrix_mautrix_signal_db_service_stat.stat.exists"
when: "matrix_mautrix_signal_service_stat.stat.exists or matrix_mautrix_signal_daemon_service_stat.stat.exists"

View File

@ -10,9 +10,6 @@
- "matrix_mautrix_signal_homeserver_address"
- "matrix_mautrix_signal_homeserver_token"
- "matrix_mautrix_signal_appservice_token"
- "matrix_mautrix_signal_db_user"
- "matrix_mautrix_signal_db_password"
- "matrix_mautrix_signal_db_database"
- name: (Deprecation) Catch and report renamed Signal variables
fail:
@ -22,3 +19,9 @@
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'}