finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renamed matrix_lottieconverter to matrix_telegram_lottieconverter

Browse Source
This commit is contained in:
Toorero 2021-07-17 14:05:13 +02:00
parent 7f15787d54
commit 3a28100131
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
group_vars/matrix_servers
View File

@ -393,8 +393,8 @@ matrix_mautrix_telegram_enabled: false
# Images are multi-arch (amd64 and arm64, but not arm32). # Images are multi-arch (amd64 and arm64, but not arm32).
matrix_mautrix_telegram_container_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}" matrix_mautrix_telegram_container_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}"
matrix_lottieconverter_container_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}" matrix_telegram_lottieconverter_container_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}"
matrix_lottieconverter_container_self_build_mask_arch: "{{ matrix_architecture != 'amd64' }}" matrix_telegram_lottieconverter_container_self_build_mask_arch: "{{ matrix_architecture != 'amd64' }}"
matrix_mautrix_telegram_systemd_required_services_list: | matrix_mautrix_telegram_systemd_required_services_list: |
{{ {{

10
roles/matrix-bridge-mautrix-telegram/defaults/main.yml
View File

@ -3,11 +3,11 @@
matrix_mautrix_telegram_enabled: true matrix_mautrix_telegram_enabled: true
matrix_lottieconverter_container_self_build: false matrix_telegram_lottieconverter_container_self_build: false
matrix_lottieconverter_container_self_build_mask_arch: false matrix_telegram_lottieconverter_container_self_build_mask_arch: false
matrix_lottieconverter_docker_repo: "https://mau.dev/tulir/lottieconverter.git" matrix_telegram_lottieconverter_docker_repo: "https://mau.dev/tulir/lottieconverter.git"
matrix_lottieconverter_docker_src_files_path: "{{ matrix_base_data_path }}/lotticonverter/docker-src" matrix_telegram_lottieconverter_docker_src_files_path: "{{ matrix_base_data_path }}/lotticonverter/docker-src"
matrix_lottieconverter_docker_image: "dock.mau.dev/tulir/lottieconverter:alpine-3.14" # needs to be ajusted according to FROM clause of Dockerfile of mautrix-telegram matrix_telegram_lottieconverter_docker_image: "dock.mau.dev/tulir/lottieconverter:alpine-3.14" # needs to be ajusted according to FROM clause of Dockerfile of mautrix-telegram
matrix_mautrix_telegram_container_self_build: false matrix_mautrix_telegram_container_self_build: false
matrix_mautrix_telegram_docker_repo: "https://mau.dev/tulir/mautrix-telegram.git" matrix_mautrix_telegram_docker_repo: "https://mau.dev/tulir/mautrix-telegram.git"

24
roles/matrix-bridge-mautrix-telegram/tasks/setup_install.yml
View File

@ -58,23 +58,23 @@
- name: Ensure lottieconverter is present when self-building - name: Ensure lottieconverter is present when self-building
git: git:
repo: "{{ matrix_lottieconverter_docker_repo }}" repo: "{{ matrix_telegram_lottieconverter_docker_repo }}"
dest: "{{ matrix_lottieconverter_docker_src_files_path }}" dest: "{{ matrix_telegram_lottieconverter_docker_src_files_path }}"
force: "yes" force: "yes"
register: matrix_lottieconverter_git_pull_results register: matrix_telegram_lottieconverter_git_pull_results
when: "matrix_lottieconverter_container_self_build|bool and matrix_mautrix_telegram_container_self_build|bool" when: "matrix_telegram_lottieconverter_container_self_build|bool and matrix_mautrix_telegram_container_self_build|bool"
- name: Ensure lottieconverter Docker image is built - name: Ensure lottieconverter Docker image is built
docker_image: docker_image:
name: "{{ matrix_lottieconverter_docker_image }}" name: "{{ matrix_telegram_lottieconverter_docker_image }}"
source: build source: build
force_source: "{{ matrix_lottieconverter_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}" force_source: "{{ matrix_telegram_lottieconverter_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_lottieconverter_git_pull_results.changed }}" force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_telegram_lottieconverter_git_pull_results.changed }}"
build: build:
dockerfile: Dockerfile dockerfile: Dockerfile
path: "{{ matrix_lottieconverter_docker_src_files_path }}" path: "{{ matrix_telegram_lottieconverter_docker_src_files_path }}"
pull: yes pull: yes
when: "matrix_lottieconverter_container_self_build|bool and matrix_lottieconverter_git_pull_results.changed and matrix_mautrix_telegram_container_self_build|bool" when: "matrix_telegram_lottieconverter_container_self_build|bool and matrix_telegram_lottieconverter_git_pull_results.changed and matrix_mautrix_telegram_container_self_build|bool"
- name: Ensure matrix-mautrix-telegram repository is present when self-building - name: Ensure matrix-mautrix-telegram repository is present when self-building
git: git:
@ -87,7 +87,7 @@
- name: Ensure TARGETARCH is beeing masked - name: Ensure TARGETARCH is beeing masked
command: sed -i "3s/ARG/#ARG/" "{{ matrix_mautrix_telegram_docker_src_files_path }}/Dockerfile" command: sed -i "3s/ARG/#ARG/" "{{ matrix_mautrix_telegram_docker_src_files_path }}/Dockerfile"
when: "matrix_lottieconverter_container_self_build_mask_arch|bool" when: "matrix_telegram_lottieconverter_container_self_build_mask_arch|bool"
- name: Ensure matrix-mautrix-telegram Docker image is built - name: Ensure matrix-mautrix-telegram Docker image is built
docker_image: docker_image:
@ -98,13 +98,13 @@
build: build:
dockerfile: Dockerfile dockerfile: Dockerfile
path: "{{ matrix_mautrix_telegram_docker_src_files_path }}" path: "{{ matrix_mautrix_telegram_docker_src_files_path }}"
pull: "{{ not matrix_lottieconverter_container_self_build_mask_arch|bool }}" pull: "{{ not matrix_telegram_lottieconverter_container_self_build_mask_arch|bool }}"
when: "matrix_mautrix_telegram_container_self_build|bool and matrix_mautrix_telegram_git_pull_results.changed" when: "matrix_mautrix_telegram_container_self_build|bool and matrix_mautrix_telegram_git_pull_results.changed"
# Unmask so no git changes are beeing detected # Unmask so no git changes are beeing detected
- name: Ensure TARGETARCH is beeing unmasked - name: Ensure TARGETARCH is beeing unmasked
command: sed -i "3s/#ARG/ARG/" "{{ matrix_mautrix_telegram_docker_src_files_path }}/Dockerfile" command: sed -i "3s/#ARG/ARG/" "{{ matrix_mautrix_telegram_docker_src_files_path }}/Dockerfile"
when: "matrix_lottieconverter_container_self_build_mask_arch|bool" when: "matrix_telegram_lottieconverter_container_self_build_mask_arch|bool"
- name: Check if an old database file already exists - name: Check if an old database file already exists
stat: stat: