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

Merge branch 'spantaleev:master' into master

pull/1478/head
Shreyas Ajjarapu 4 лет назад
committed by GitHub
Родитель
Сommit
bae375f3af
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 4AEE18F83AFDEB23
2 измененных файлов: 3 добавлений и 3 удалений
  1. +1
    -1
      roles/matrix-bridge-mautrix-instagram/templates/config.yaml.j2
  2. +2
    -2
      roles/matrix-synapse/defaults/main.yml

+ 1
- 1
roles/matrix-bridge-mautrix-instagram/templates/config.yaml.j2 Просмотреть файл

@@ -43,7 +43,7 @@ appservice:
bot_username: {{ matrix_mautrix_instagram_appservice_bot_username|to_json }}
# Display name and avatar for bot. Set to "remove" to remove display name/avatar, leave empty
# to leave display name/avatar as-is.
bot_displayname: instagram bridge bot
bot_displayname: Instagram bridge bot
bot_avatar: mxc://maunium.net/JxjlbZUlCPULEeHZSwleUXQv

# Community ID for bridged users (changes registration file) and rooms.


+ 2
- 2
roles/matrix-synapse/defaults/main.yml Просмотреть файл

@@ -15,8 +15,8 @@ matrix_synapse_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_cont
# amd64 gets released first.
# arm32 relies on self-building, so the same version can be built immediately.
# arm64 users need to wait for a prebuilt image to become available.
matrix_synapse_version: v1.49.0
matrix_synapse_version_arm64: v1.49.0
matrix_synapse_version: v1.49.1
matrix_synapse_version_arm64: v1.49.1
matrix_synapse_docker_image_tag: "{{ matrix_synapse_version if matrix_architecture in ['arm32', 'amd64'] else matrix_synapse_version_arm64 }}"
matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"



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