mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2025-12-22 16:02:40 +03:00
Compare commits
31 Commits
renovate/m
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
048ce7503d | ||
|
|
2161500e60 | ||
|
|
927f6fa2e3 | ||
|
|
66c85f63e6 | ||
|
|
9ea18d6f2d | ||
|
|
a073f21a8f | ||
|
|
68337b6f45 | ||
|
|
a8ef76735d | ||
|
|
df6ac15324 | ||
|
|
ce14e60a02 | ||
|
|
16bec7bfbb | ||
|
|
91e9d0b227 | ||
|
|
c05849920d | ||
|
|
2e313f6c38 | ||
|
|
6d202a30fc | ||
|
|
42cfbc06cc | ||
|
|
17898f6be2 | ||
|
|
a1df76f9d4 | ||
|
|
f2242246ec | ||
|
|
12bee503e0 | ||
|
|
e7cb9eee79 | ||
|
|
e813932240 | ||
|
|
98331ae970 | ||
|
|
5612af92e8 | ||
|
|
1f31975aef | ||
|
|
fa3d05ea81 | ||
|
|
5c0c03893f | ||
|
|
f7a3bde4a7 | ||
|
|
52278a8108 | ||
|
|
3a12aa7682 | ||
|
|
6a8a1dfa24 |
2
.github/workflows/lock-threads.yml
vendored
2
.github/workflows/lock-threads.yml
vendored
@@ -23,7 +23,7 @@ jobs:
|
||||
if: github.repository == 'spantaleev/matrix-docker-ansible-deploy'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: dessant/lock-threads@v5
|
||||
- uses: dessant/lock-threads@v6
|
||||
with:
|
||||
add-issue-labels: 'outdated'
|
||||
process-only: 'issues, prs'
|
||||
|
||||
2
.github/workflows/matrix.yml
vendored
2
.github/workflows/matrix.yml
vendored
@@ -26,7 +26,7 @@ jobs:
|
||||
uses: actions/checkout@v6
|
||||
|
||||
- name: Run ansible-lint
|
||||
uses: ansible/ansible-lint@v25.12.0
|
||||
uses: ansible/ansible-lint@v25.12.1
|
||||
with:
|
||||
args: "roles/custom"
|
||||
setup_python: "true"
|
||||
|
||||
@@ -5836,6 +5836,20 @@ traefik_gid: "{{ matrix_user_gid }}"
|
||||
# This override (for the `web` entrypoint) also cascades to overriding the `web-secure` entrypoint and the `matrix-federation` entrypoint.
|
||||
traefik_config_entrypoint_web_transport_respondingTimeouts_readTimeout: 300s
|
||||
|
||||
# Traefik v3.6.3+ blocks encoded characters in request paths by default for security.
|
||||
# Matrix API endpoints require encoded slashes (e.g., in room keys URLs) and encoded hashes (e.g., in room directory URLs).
|
||||
# Ref:
|
||||
# - https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/4798
|
||||
# - https://doc.traefik.io/traefik/migrate/v3/#v364
|
||||
traefik_config_entrypoint_web_secure_http_encodedCharacters_enabled: true
|
||||
traefik_config_entrypoint_web_secure_http_encodedCharacters_allowEncodedSlash: true
|
||||
traefik_config_entrypoint_web_secure_http_encodedCharacters_allowEncodedHash: true
|
||||
# Doing the same for the `web` entrypoint, for people who disable SSL for the playbook
|
||||
# and actually go through this entrypoint.
|
||||
traefik_config_entrypoint_web_http_encodedCharacters_enabled: "{{ not matrix_playbook_ssl_enabled }}"
|
||||
traefik_config_entrypoint_web_http_encodedCharacters_allowEncodedSlash: "{{ not matrix_playbook_ssl_enabled }}"
|
||||
traefik_config_entrypoint_web_http_encodedCharacters_allowEncodedHash: "{{ not matrix_playbook_ssl_enabled }}"
|
||||
|
||||
traefik_additional_entrypoints_auto: |
|
||||
{{
|
||||
([matrix_playbook_public_matrix_federation_api_traefik_entrypoint_definition] if matrix_playbook_public_matrix_federation_api_traefik_entrypoint_enabled else [])
|
||||
|
||||
@@ -3,7 +3,7 @@ babel==2.17.0
|
||||
certifi==2025.11.12
|
||||
charset-normalizer==3.4.4
|
||||
click==8.3.1
|
||||
docutils==0.22.3
|
||||
docutils==0.22.4
|
||||
idna==3.11
|
||||
imagesize==1.4.1
|
||||
Jinja2==3.1.6
|
||||
@@ -30,4 +30,4 @@ sphinxcontrib-qthelp==2.0.0
|
||||
sphinxcontrib-serializinghtml==2.0.0
|
||||
tabulate==0.9.0
|
||||
uc-micro-py==1.0.3
|
||||
urllib3==2.6.1
|
||||
urllib3==2.6.2
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
version: v1.0.0-5
|
||||
name: auxiliary
|
||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-backup_borg.git
|
||||
version: v1.4.2-2.0.12-0
|
||||
version: v1.4.3-2.0.13-0
|
||||
name: backup_borg
|
||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-container-socket-proxy.git
|
||||
version: v0.4.1-2
|
||||
version: v0.4.2-0
|
||||
name: container_socket_proxy
|
||||
- src: git+https://github.com/geerlingguy/ansible-role-docker
|
||||
version: 7.9.0
|
||||
@@ -28,7 +28,7 @@
|
||||
version: v10655-0
|
||||
name: jitsi
|
||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-livekit-server.git
|
||||
version: v1.9.7-0
|
||||
version: v1.9.9-0
|
||||
name: livekit_server
|
||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-ntfy.git
|
||||
version: v2.15.0-0
|
||||
@@ -49,7 +49,7 @@
|
||||
version: v18-0
|
||||
name: postgres_backup
|
||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus.git
|
||||
version: v3.8.0-0
|
||||
version: v3.8.1-0
|
||||
name: prometheus
|
||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus-node-exporter.git
|
||||
version: v1.9.1-12
|
||||
@@ -67,11 +67,11 @@
|
||||
version: v1.1.0-1
|
||||
name: timesync
|
||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-traefik.git
|
||||
version: v3.6.4-0
|
||||
version: v3.6.5-0
|
||||
name: traefik
|
||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-traefik-certs-dumper.git
|
||||
version: v2.10.0-3
|
||||
name: traefik_certs_dumper
|
||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-valkey.git
|
||||
version: v9-0
|
||||
version: v9.0.1-0
|
||||
name: valkey
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
matrix_appservice_draupnir_for_all_enabled: true
|
||||
|
||||
# renovate: datasource=docker depName=gnuxie/draupnir
|
||||
matrix_appservice_draupnir_for_all_version: "v2.8.0"
|
||||
matrix_appservice_draupnir_for_all_version: "v2.9.0"
|
||||
|
||||
matrix_appservice_draupnir_for_all_container_image_self_build: false
|
||||
matrix_appservice_draupnir_for_all_container_image_self_build_repo: "https://github.com/the-draupnir-project/Draupnir.git"
|
||||
|
||||
@@ -321,6 +321,13 @@ matrix_playbook_public_matrix_federation_api_traefik_entrypoint_port: "{{ matrix
|
||||
matrix_playbook_public_matrix_federation_api_traefik_entrypoint_host_bind_port: "{{ matrix_federation_public_port }}"
|
||||
matrix_playbook_public_matrix_federation_api_traefik_entrypoint_host_bind_port_udp: "{{ matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http3_advertisedPort if matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http3_enabled else '' }}"
|
||||
matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config: "{{ (matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_default | combine(matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_auto)) | combine(matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_custom, recursive=True) }}"
|
||||
# Traefik v3.6.3+ blocks encoded characters in request paths by default for security.
|
||||
# Matrix API endpoints require encoded slashes and hashes in endpoints containing room IDs, room aliases, etc.
|
||||
# Ref:
|
||||
# - https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/4798
|
||||
# - https://doc.traefik.io/traefik/migrate/v3/#v364
|
||||
matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http_encodedCharacters_allowEncodedSlash: true # noqa: var-naming[pattern]
|
||||
matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http_encodedCharacters_allowEncodedHash: true # noqa: var-naming[pattern]
|
||||
matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http3_enabled: true
|
||||
matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http3_advertisedPort: "{{ matrix_playbook_public_matrix_federation_api_traefik_entrypoint_port }}" # noqa var-naming
|
||||
matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_transport_respondingTimeouts_readTimeout: "{{ traefik_config_entrypoint_web_secure_transport_respondingTimeouts_readTimeout }}" # noqa var-naming
|
||||
@@ -330,6 +337,19 @@ matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_default:
|
||||
{{
|
||||
{}
|
||||
|
||||
| combine(
|
||||
(
|
||||
{
|
||||
'http': {
|
||||
'encodedCharacters': {
|
||||
'allowEncodedSlash': matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http_encodedCharacters_allowEncodedSlash,
|
||||
'allowEncodedHash': matrix_playbook_public_matrix_federation_api_traefik_entrypoint_config_http_encodedCharacters_allowEncodedHash,
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
)
|
||||
|
||||
| combine(
|
||||
(
|
||||
(
|
||||
@@ -391,7 +411,31 @@ matrix_playbook_internal_matrix_client_api_traefik_entrypoint_enabled: "{{ matri
|
||||
matrix_playbook_internal_matrix_client_api_traefik_entrypoint_name: matrix-internal-matrix-client-api
|
||||
matrix_playbook_internal_matrix_client_api_traefik_entrypoint_port: 8008
|
||||
matrix_playbook_internal_matrix_client_api_traefik_entrypoint_host_bind_port: ''
|
||||
matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config: "{{ matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config_auto | combine(matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config_custom, recursive=True) }}"
|
||||
matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config: "{{ (matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config_default | combine(matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config_auto)) | combine(matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config_custom, recursive=True) }}"
|
||||
# Traefik v3.6.3+ blocks encoded characters in request paths by default for security.
|
||||
# Matrix API endpoints require encoded slashes and hashes in endpoints containing room IDs, room aliases, etc.
|
||||
# Ref:
|
||||
# - https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/4798
|
||||
# - https://doc.traefik.io/traefik/migrate/v3/#v364
|
||||
matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config_http_encodedCharacters_allowEncodedSlash: true # noqa: var-naming[pattern]
|
||||
matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config_http_encodedCharacters_allowEncodedHash: true # noqa: var-naming[pattern]
|
||||
matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config_default: |
|
||||
{{
|
||||
{}
|
||||
|
||||
| combine(
|
||||
(
|
||||
{
|
||||
'http': {
|
||||
'encodedCharacters': {
|
||||
'allowEncodedSlash': matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config_http_encodedCharacters_allowEncodedSlash,
|
||||
'allowEncodedHash': matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config_http_encodedCharacters_allowEncodedHash,
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
)
|
||||
}}
|
||||
matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config_auto: {}
|
||||
matrix_playbook_internal_matrix_client_api_traefik_entrypoint_config_custom: {}
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ matrix_bot_baibot_container_repo_version: "{{ 'main' if matrix_bot_baibot_versio
|
||||
matrix_bot_baibot_container_src_files_path: "{{ matrix_base_data_path }}/baibot/container-src"
|
||||
|
||||
# renovate: datasource=docker depName=ghcr.io/etkecc/baibot
|
||||
matrix_bot_baibot_version: v1.10.0
|
||||
matrix_bot_baibot_version: v1.12.0
|
||||
matrix_bot_baibot_container_image: "{{ matrix_bot_baibot_container_image_registry_prefix }}etkecc/baibot:{{ matrix_bot_baibot_version }}"
|
||||
matrix_bot_baibot_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_baibot_container_image_self_build else matrix_bot_baibot_container_image_registry_prefix_upstream }}"
|
||||
matrix_bot_baibot_container_image_registry_prefix_upstream: "{{ matrix_bot_baibot_container_image_registry_prefix_upstream_default }}"
|
||||
@@ -70,6 +70,23 @@ matrix_bot_baibot_config_user_password: ''
|
||||
# Also see: `matrix_bot_baibot_config_user_mxid_localpart`
|
||||
matrix_bot_baibot_config_user_name: baibot
|
||||
|
||||
# Controls the `user.avatar` configuration setting.
|
||||
#
|
||||
# An optional path to an image file to be used as a custom avatar image.
|
||||
# This path should be an in-container path (e.g., `/data/avatar.png`).
|
||||
# Any type of content type is supported, but stick to common image formats (PNG, JPG, ..) for better compatibility with various Matrix clients.
|
||||
#
|
||||
# To use a custom avatar:
|
||||
# - Use the auxiliary role (`aux_` variables) to upload your avatar file to the server (e.g. to {{ matrix_bot_baibot_data_path }}/avatar.png on the host),
|
||||
# or do it any other way (without Ansible) you prefer
|
||||
# - Set this variable to something like `/data/avatar.png` (the in-container path)
|
||||
#
|
||||
# Possible values:
|
||||
# - null or empty string: use the default baibot avatar
|
||||
# - "keep": don't touch the avatar, keep whatever is already set (useful if you manage the avatar via other means)
|
||||
# - any other value: path to a custom avatar image file (must be an in-container path like `/data/avatar.png`)
|
||||
matrix_bot_baibot_config_user_avatar: null
|
||||
|
||||
# Controls the `user.encryption.recovery_passphrase` configuration setting.
|
||||
#
|
||||
# An optional passphrase to use for backing up and recovering the bot's encryption keys.
|
||||
@@ -368,7 +385,7 @@ matrix_bot_baibot_config_agents_static_definitions_openai_config_api_key: ""
|
||||
|
||||
matrix_bot_baibot_config_agents_static_definitions_openai_config_text_generation_enabled: true
|
||||
# For valid model choices, see: https://platform.openai.com/docs/models
|
||||
matrix_bot_baibot_config_agents_static_definitions_openai_config_text_generation_model_id: gpt-5.1
|
||||
matrix_bot_baibot_config_agents_static_definitions_openai_config_text_generation_model_id: gpt-5.2
|
||||
# The prompt text to use (can be null or empty to not use a prompt).
|
||||
# See: https://huggingface.co/docs/transformers/en/tasks/prompting
|
||||
matrix_bot_baibot_config_agents_static_definitions_openai_config_text_generation_prompt: "{{ matrix_bot_baibot_config_agents_static_definitions_prompt }}"
|
||||
@@ -389,7 +406,7 @@ matrix_bot_baibot_config_agents_static_definitions_openai_config_text_to_speech_
|
||||
matrix_bot_baibot_config_agents_static_definitions_openai_config_text_to_speech_response_format: opus
|
||||
|
||||
matrix_bot_baibot_config_agents_static_definitions_openai_config_image_generation_enabled: true
|
||||
matrix_bot_baibot_config_agents_static_definitions_openai_config_image_generation_model_id: gpt-image-1
|
||||
matrix_bot_baibot_config_agents_static_definitions_openai_config_image_generation_model_id: gpt-image-1.5
|
||||
matrix_bot_baibot_config_agents_static_definitions_openai_config_image_generation_style: null
|
||||
matrix_bot_baibot_config_agents_static_definitions_openai_config_image_generation_size: null
|
||||
matrix_bot_baibot_config_agents_static_definitions_openai_config_image_generation_quality: null
|
||||
|
||||
@@ -21,6 +21,12 @@ user:
|
||||
# Leave empty to use the default (baibot).
|
||||
name: {{ matrix_bot_baibot_config_user_name | to_json }}
|
||||
|
||||
# An optional path to an image file to be used as a custom avatar image.
|
||||
# - null or empty string: use the default avatar
|
||||
# - "keep": don't touch the avatar, keep whatever is already set
|
||||
# - any other value: path to a custom avatar image file
|
||||
avatar: {{ matrix_bot_baibot_config_user_avatar | to_json }}
|
||||
|
||||
encryption:
|
||||
# An optional passphrase to use for backing up and recovering the bot's encryption keys.
|
||||
# You can use any string here.
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
matrix_bot_draupnir_enabled: true
|
||||
|
||||
# renovate: datasource=docker depName=gnuxie/draupnir
|
||||
matrix_bot_draupnir_version: "v2.8.0"
|
||||
matrix_bot_draupnir_version: "v2.9.0"
|
||||
|
||||
matrix_bot_draupnir_container_image_self_build: false
|
||||
matrix_bot_draupnir_container_image_self_build_repo: "https://github.com/the-draupnir-project/Draupnir.git"
|
||||
|
||||
@@ -20,7 +20,7 @@ matrix_mautrix_meta_instagram_enabled: true
|
||||
matrix_mautrix_meta_instagram_identifier: matrix-mautrix-meta-instagram
|
||||
|
||||
# renovate: datasource=docker depName=dock.mau.dev/mautrix/meta
|
||||
matrix_mautrix_meta_instagram_version: v0.2511.0
|
||||
matrix_mautrix_meta_instagram_version: v0.2512.0
|
||||
|
||||
matrix_mautrix_meta_instagram_base_path: "{{ matrix_base_data_path }}/mautrix-meta-instagram"
|
||||
matrix_mautrix_meta_instagram_config_path: "{{ matrix_mautrix_meta_instagram_base_path }}/config"
|
||||
|
||||
@@ -20,7 +20,7 @@ matrix_mautrix_meta_messenger_enabled: true
|
||||
matrix_mautrix_meta_messenger_identifier: matrix-mautrix-meta-messenger
|
||||
|
||||
# renovate: datasource=docker depName=dock.mau.dev/mautrix/meta
|
||||
matrix_mautrix_meta_messenger_version: v0.2511.0
|
||||
matrix_mautrix_meta_messenger_version: v0.2512.0
|
||||
|
||||
matrix_mautrix_meta_messenger_base_path: "{{ matrix_base_data_path }}/mautrix-meta-messenger"
|
||||
matrix_mautrix_meta_messenger_config_path: "{{ matrix_mautrix_meta_messenger_base_path }}/config"
|
||||
|
||||
@@ -25,7 +25,7 @@ matrix_mautrix_signal_container_image_self_build_repo: "https://mau.dev/mautrix/
|
||||
matrix_mautrix_signal_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_signal_version == 'latest' else matrix_mautrix_signal_version }}"
|
||||
|
||||
# renovate: datasource=docker depName=dock.mau.dev/mautrix/signal
|
||||
matrix_mautrix_signal_version: v0.2511.0
|
||||
matrix_mautrix_signal_version: v0.2512.0
|
||||
|
||||
# See: https://mau.dev/mautrix/signal/container_registry
|
||||
matrix_mautrix_signal_docker_image: "{{ matrix_mautrix_signal_docker_image_registry_prefix }}mautrix/signal:{{ matrix_mautrix_signal_docker_image_tag }}"
|
||||
|
||||
@@ -28,7 +28,7 @@ matrix_mautrix_whatsapp_container_image_self_build_repo: "https://mau.dev/mautri
|
||||
matrix_mautrix_whatsapp_container_image_self_build_branch: "{{ 'master' if matrix_mautrix_whatsapp_version == 'latest' else matrix_mautrix_whatsapp_version }}"
|
||||
|
||||
# renovate: datasource=docker depName=dock.mau.dev/mautrix/whatsapp
|
||||
matrix_mautrix_whatsapp_version: v0.2511.0
|
||||
matrix_mautrix_whatsapp_version: v0.2512.0
|
||||
|
||||
# See: https://mau.dev/mautrix/whatsapp/container_registry
|
||||
matrix_mautrix_whatsapp_docker_image: "{{ matrix_mautrix_whatsapp_docker_image_registry_prefix }}mautrix/whatsapp:{{ matrix_mautrix_whatsapp_version }}"
|
||||
|
||||
@@ -18,7 +18,7 @@ matrix_postmoogle_docker_repo_version: "{{ 'main' if matrix_postmoogle_version =
|
||||
matrix_postmoogle_docker_src_files_path: "{{ matrix_base_data_path }}/postmoogle/docker-src"
|
||||
|
||||
# renovate: datasource=docker depName=ghcr.io/etkecc/postmoogle
|
||||
matrix_postmoogle_version: v0.9.27
|
||||
matrix_postmoogle_version: v0.9.28
|
||||
matrix_postmoogle_docker_image: "{{ matrix_postmoogle_docker_image_registry_prefix }}etkecc/postmoogle:{{ matrix_postmoogle_version }}"
|
||||
matrix_postmoogle_docker_image_registry_prefix: "{{ 'localhost/' if matrix_postmoogle_container_image_self_build else matrix_postmoogle_docker_image_registry_prefix_upstream }}"
|
||||
matrix_postmoogle_docker_image_registry_prefix_upstream: "{{ matrix_postmoogle_docker_image_registry_prefix_upstream_default }}"
|
||||
|
||||
@@ -29,7 +29,7 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/eleme
|
||||
matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_facts['memtotal_mb'] < 4096 }}"
|
||||
|
||||
# renovate: datasource=docker depName=ghcr.io/element-hq/element-web
|
||||
matrix_client_element_version: v1.12.6
|
||||
matrix_client_element_version: v1.12.7
|
||||
|
||||
matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_registry_prefix }}element-hq/element-web:{{ matrix_client_element_version }}"
|
||||
matrix_client_element_docker_image_registry_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_client_element_docker_image_registry_prefix_upstream }}"
|
||||
|
||||
@@ -13,7 +13,7 @@ matrix_client_fluffychat_container_image_self_build_repo: "https://github.com/et
|
||||
matrix_client_fluffychat_container_image_self_build_version: "{{ 'main' if matrix_client_fluffychat_version == 'latest' else matrix_client_fluffychat_version }}"
|
||||
|
||||
# renovate: datasource=docker depName=ghcr.io/etkecc/fluffychat-web
|
||||
matrix_client_fluffychat_version: v2.2.0
|
||||
matrix_client_fluffychat_version: v2.3.0
|
||||
matrix_client_fluffychat_docker_image: "{{ matrix_client_fluffychat_docker_image_registry_prefix }}etkecc/fluffychat-web:{{ matrix_client_fluffychat_version }}"
|
||||
matrix_client_fluffychat_docker_image_registry_prefix: "{{ 'localhost/' if matrix_client_fluffychat_container_image_self_build else matrix_client_fluffychat_docker_image_registry_prefix_upstream }}"
|
||||
matrix_client_fluffychat_docker_image_registry_prefix_upstream: "{{ matrix_client_fluffychat_docker_image_registry_prefix_upstream_default }}"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
matrix_element_admin_enabled: true
|
||||
|
||||
# renovate: datasource=docker depName=oci.element.io/element-admin
|
||||
matrix_element_admin_version: 0.1.9
|
||||
matrix_element_admin_version: 0.1.10
|
||||
|
||||
matrix_element_admin_scheme: https
|
||||
|
||||
|
||||
@@ -28,13 +28,7 @@ matrix_matrixto_hostname: ""
|
||||
# technical limitations.
|
||||
matrix_matrixto_path_prefix: /
|
||||
|
||||
matrix_matrixto_container_image: "{{ matrix_matrixto_container_image_registry_prefix }}shirahara/matrixto:{{ matrix_matrixto_container_image_tag }}"
|
||||
matrix_matrixto_container_image_tag: "{{ matrix_matrixto_version }}"
|
||||
matrix_matrixto_container_image_registry_prefix: "{{ matrix_matrixto_container_image_registry_prefix_upstream }}"
|
||||
matrix_matrixto_container_image_registry_prefix_upstream: "{{ matrix_matrixto_container_image_registry_prefix_upstream_default }}"
|
||||
matrix_matrixto_container_image_registry_prefix_upstream_default: ""
|
||||
matrix_matrixto_container_image_force_pull: "{{ matrix_matrixto_container_image.endswith(':latest') }}"
|
||||
|
||||
# There does not exist a known pre-built container image. It needs to be built locally.
|
||||
matrix_matrixto_container_image_self_build: true
|
||||
matrix_matrixto_container_image_self_build_name: "shirahara/matrixto:{{ matrix_matrixto_container_image_self_build_repo_version }}"
|
||||
matrix_matrixto_container_image_self_build_repo: "https://seed.radicle.garden/z3Re1EQbd186vUQDwHByYiLadsVWY.git"
|
||||
|
||||
@@ -25,35 +25,7 @@
|
||||
- env
|
||||
- labels
|
||||
|
||||
- name: Run if self-building of Matrix.to container image is not enabled
|
||||
when: "not matrix_matrixto_container_image_self_build | bool"
|
||||
block:
|
||||
- name: Ensure Matrix.to container image is pulled via community.docker.docker_image
|
||||
when: devture_systemd_docker_base_container_image_pull_method == 'ansible-module'
|
||||
community.docker.docker_image:
|
||||
name: "{{ matrix_matrixto_container_image }}"
|
||||
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
|
||||
force_source: "{{ matrix_matrixto_container_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_matrixto_container_image_force_pull }}"
|
||||
register: result
|
||||
retries: "{{ devture_playbook_help_container_retries_count }}"
|
||||
delay: "{{ devture_playbook_help_container_retries_delay }}"
|
||||
until: result is not failed
|
||||
|
||||
- name: Ensure Matrix.to container image is pulled via ansible.builtin.command
|
||||
when: devture_systemd_docker_base_container_image_pull_method == 'command'
|
||||
ansible.builtin.command:
|
||||
cmd: "{{ devture_systemd_docker_base_host_command_docker }} pull {{ matrix_matrixto_container_image }}"
|
||||
register: result
|
||||
retries: "{{ devture_playbook_help_container_retries_count }}"
|
||||
delay: "{{ devture_playbook_help_container_retries_delay }}"
|
||||
until: result is not failed
|
||||
changed_when: "'Downloaded newer image' in result.stdout"
|
||||
|
||||
- name: Run if self-building of Matrix.to container image is enabled
|
||||
when: "matrix_matrixto_container_image_self_build | bool"
|
||||
block:
|
||||
- name: Ensure Matrix.to repository is present on self-build
|
||||
- name: Ensure Matrix.to repository is present on self-build
|
||||
ansible.builtin.git:
|
||||
repo: "{{ matrix_matrixto_container_image_self_build_repo }}"
|
||||
version: "{{ matrix_matrixto_container_image_self_build_repo_version }}"
|
||||
@@ -61,7 +33,7 @@
|
||||
force: "yes"
|
||||
register: matrix_matrixto_git_pull_results
|
||||
|
||||
- name: Ensure Matrix.to container image is built
|
||||
- name: Ensure Matrix.to container image is built
|
||||
community.docker.docker_image:
|
||||
name: "{{ matrix_matrixto_container_image_self_build_name }}"
|
||||
source: build
|
||||
|
||||
@@ -40,7 +40,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
|
||||
{% for arg in matrix_matrixto_container_extra_arguments %}
|
||||
{{ arg }} \
|
||||
{% endfor %}
|
||||
{{ matrix_matrixto_container_image_self_build_name if matrix_matrixto_container_image_self_build else matrix_matrixto_container_image }}
|
||||
{{ matrix_matrixto_container_image_self_build_name }}
|
||||
|
||||
{% for network in matrix_matrixto_container_additional_networks %}
|
||||
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_matrixto_identifier }}
|
||||
|
||||
Reference in New Issue
Block a user