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

Revert "Move some related tasks closer together in matrix-client-hydrogen"

This reverts commit e913347fe1.
pull/1272/head
Aaron Raimist 4 лет назад
Родитель
Сommit
82641092a7
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 37419210002890EF
1 измененных файлов: 11 добавлений и 11 удалений
  1. +11
    -11
      roles/matrix-client-hydrogen/tasks/setup.yml

+ 11
- 11
roles/matrix-client-hydrogen/tasks/setup.yml Просмотреть файл

@@ -33,17 +33,6 @@
register: matrix_client_hydrogen_git_pull_results
when: "matrix_client_hydrogen_enabled|bool and matrix_client_hydrogen_container_image_self_build|bool"

- name: Ensure Hydrogen Docker image is built
docker_image:
name: "{{ matrix_client_hydrogen_docker_image }}"
source: build
force_source: "{{ matrix_client_hydrogen_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_client_hydrogen_docker_src_files_path }}"
pull: yes
when: "matrix_client_hydrogen_enabled|bool and matrix_client_hydrogen_container_image_self_build|bool"

- name: Ensure Hydrogen configuration installed
copy:
content: "{{ matrix_client_hydrogen_configuration|to_nice_json }}"
@@ -64,6 +53,17 @@
- {src: "{{ role_path }}/templates/nginx.conf.j2", name: "nginx.conf"}
when: "matrix_client_hydrogen_enabled|bool and item.src is not none"

- name: Ensure Hydrogen Docker image is built
docker_image:
name: "{{ matrix_client_hydrogen_docker_image }}"
source: build
force_source: "{{ matrix_client_hydrogen_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_client_hydrogen_docker_src_files_path }}"
pull: yes
when: "matrix_client_hydrogen_enabled|bool and matrix_client_hydrogen_container_image_self_build|bool"

- name: Ensure matrix-client-hydrogen.service installed
template:
src: "{{ role_path }}/templates/systemd/matrix-client-hydrogen.service.j2"


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