Просмотр исходного кода

Add appservice_database_type and appservice_database_uri variables for mautrix-telegram bridge

Adds new structured database configuration variables:
- matrix_mautrix_telegram_appservice_database_type
- matrix_mautrix_telegram_appservice_database_uri

These replace the legacy appservice_database approach and provide proper
type/URI separation for the mautrix-telegram bridge configuration.
pull/5269/head
Matěj Cepl 1 месяц назад
Родитель
Сommit
6d4ee4c476
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 79205802880BC9D8
3 измененных файлов: 37 добавлений и 38 удалений
  1. +6
    -6
      jitsi_jvb.yml
  2. +0
    -1
      roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml
  3. +31
    -31
      setup.yml

+ 6
- 6
jitsi_jvb.yml Просмотреть файл

@@ -11,11 +11,11 @@
become: true become: true


roles: roles:
- role: galaxy/com.devture.ansible.role.playbook_help
- role: galaxy/com.devture.ansible.role.systemd_docker_base
- role: playbook_help
- role: systemd_docker_base


- when: matrix_playbook_docker_installation_enabled | bool - when: matrix_playbook_docker_installation_enabled | bool
role: galaxy/geerlingguy.docker
role: docker
vars: vars:
docker_install_compose: false docker_install_compose: false
tags: tags:
@@ -26,7 +26,7 @@
- install-all - install-all


- when: devture_docker_sdk_for_python_installation_enabled | bool - when: devture_docker_sdk_for_python_installation_enabled | bool
role: galaxy/com.devture.ansible.role.docker_sdk_for_python
role: docker_sdk_for_python
tags: tags:
- setup-docker - setup-docker
- setup-all - setup-all
@@ -35,8 +35,8 @@
- install-all - install-all


- custom/matrix-base - custom/matrix-base
- galaxy/jitsi
- jitsi
- custom/matrix-common-after - custom/matrix-common-after


- when: devture_systemd_service_manager_enabled | bool - when: devture_systemd_service_manager_enabled | bool
role: galaxy/com.devture.ansible.role.systemd_service_manager
role: systemd_service_manager

+ 0
- 1
roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml Просмотреть файл

@@ -150,7 +150,6 @@ matrix_mautrix_telegram_appservice_database_type: "{{ {
'sqlite': 'sqlite3-fk-wal', 'sqlite': 'sqlite3-fk-wal',
'postgres': 'postgres', 'postgres': 'postgres',
}[matrix_mautrix_telegram_database_engine] }}" }[matrix_mautrix_telegram_database_engine] }}"

matrix_mautrix_telegram_appservice_database_uri: "{{ { matrix_mautrix_telegram_appservice_database_uri: "{{ {
'sqlite': matrix_mautrix_telegram_sqlite_database_path_in_container, 'sqlite': matrix_mautrix_telegram_sqlite_database_path_in_container,
'postgres': matrix_mautrix_telegram_database_connection_string, 'postgres': matrix_mautrix_telegram_database_connection_string,


+ 31
- 31
setup.yml Просмотреть файл

@@ -5,17 +5,17 @@


roles: roles:
# Most of the roles below are not distributed with the playbook, but downloaded separately using `ansible-galaxy` via the `just roles` command (see `justfile`). # Most of the roles below are not distributed with the playbook, but downloaded separately using `ansible-galaxy` via the `just roles` command (see `justfile`).
- role: galaxy/playbook_help
- role: playbook_help
tags: tags:
- setup-all - setup-all
- install-all - install-all


- role: galaxy/systemd_docker_base
- role: systemd_docker_base


- role: custom/matrix_playbook_migration - role: custom/matrix_playbook_migration


- when: matrix_playbook_docker_installation_enabled | bool - when: matrix_playbook_docker_installation_enabled | bool
role: galaxy/docker
role: docker
vars: vars:
docker_install_compose: false docker_install_compose: false
docker_install_compose_plugin: false docker_install_compose_plugin: false
@@ -26,7 +26,7 @@
- install-all - install-all


- when: devture_docker_sdk_for_python_installation_enabled | bool - when: devture_docker_sdk_for_python_installation_enabled | bool
role: galaxy/docker_sdk_for_python
role: docker_sdk_for_python
tags: tags:
- setup-docker - setup-docker
- setup-all - setup-all
@@ -34,7 +34,7 @@
- install-all - install-all


- when: devture_timesync_installation_enabled | bool - when: devture_timesync_installation_enabled | bool
role: galaxy/timesync
role: timesync
tags: tags:
- setup-timesync - setup-timesync
- setup-all - setup-all
@@ -42,12 +42,12 @@
- install-all - install-all


- custom/matrix-base - custom/matrix-base
- galaxy/ddclient
- galaxy/exim_relay
- ddclient
- exim_relay


- role: galaxy/postgres
- role: postgres


- galaxy/valkey
- valkey


- role: custom/matrix-authentication-service - role: custom/matrix-authentication-service
- custom/matrix-corporal - custom/matrix-corporal
@@ -99,58 +99,58 @@
- custom/matrix-tuwunel - custom/matrix-tuwunel
- custom/matrix-ketesa - custom/matrix-ketesa
- custom/matrix-synapse-usage-exporter - custom/matrix-synapse-usage-exporter
- galaxy/prometheus_nginxlog_exporter
- galaxy/prometheus_node_exporter
- galaxy/prometheus_postgres_exporter
- galaxy/prometheus
- galaxy/grafana
- prometheus_nginxlog_exporter
- prometheus_node_exporter
- prometheus_postgres_exporter
- prometheus
- grafana
- custom/matrix-prometheus-services-connect - custom/matrix-prometheus-services-connect
- custom/matrix-client-element - custom/matrix-client-element
- custom/matrix-client-commet - custom/matrix-client-commet
- galaxy/hydrogen
- galaxy/cinny
- galaxy/sable
- hydrogen
- cinny
- sable
- custom/matrix-client-schildichat - custom/matrix-client-schildichat
- custom/matrix-client-fluffychat - custom/matrix-client-fluffychat
- galaxy/jitsi
- jitsi
- custom/matrix-user-verification-service - custom/matrix-user-verification-service
- galaxy/etherpad
- etherpad
- custom/matrix-sygnal - custom/matrix-sygnal
- galaxy/ntfy
- ntfy
- custom/matrix-static-files - custom/matrix-static-files
- galaxy/coturn
- coturn
- custom/matrix-media-repo - custom/matrix-media-repo
- custom/matrix-pantalaimon - custom/matrix-pantalaimon


- custom/matrix-element-admin - custom/matrix-element-admin
- custom/matrix-element-call - custom/matrix-element-call
- galaxy/livekit_server
- livekit_server
- custom/matrix-livekit-jwt-service - custom/matrix-livekit-jwt-service


- role: galaxy/postgres_backup
- role: postgres_backup


- role: galaxy/backup_borg
- role: backup_borg


- custom/matrix-user-creator - custom/matrix-user-creator
- custom/matrix-common-after - custom/matrix-common-after


- role: galaxy/container_socket_proxy
- role: container_socket_proxy


- role: galaxy/traefik
- role: traefik


- role: galaxy/traefik_certs_dumper
- role: traefik_certs_dumper


- role: galaxy/auxiliary
- role: auxiliary


- when: devture_systemd_service_manager_enabled | bool - when: devture_systemd_service_manager_enabled | bool
role: galaxy/systemd_service_manager
role: systemd_service_manager


# This is pretty much last, because we want it to better serve as a "last known good configuration". # This is pretty much last, because we want it to better serve as a "last known good configuration".
# See: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2217#issuecomment-1301487601 # See: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2217#issuecomment-1301487601
- when: devture_playbook_state_preserver_enabled | bool - when: devture_playbook_state_preserver_enabled | bool
role: galaxy/playbook_state_preserver
role: playbook_state_preserver
tags: tags:
- setup-all - setup-all
- install-all - install-all


- role: galaxy/playbook_runtime_messages
- role: playbook_runtime_messages

Загрузка…
Отмена
Сохранить