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

refactor variable names

Browse Source
This commit is contained in:
Horvath Gergely
2020-03-08 00:28:14 +01:00
parent 310aa685f9
commit a5d94eec0b
13 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/matrix-riot-web/defaults/main.yml
View File

@ -5,7 +5,7 @@ matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.12"
matrix_riot_web_docker_image_force_pull: "{{ matrix_riot_web_docker_image.endswith(':latest') }}"
matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"
matrix_docker_riot_web_src_files_path: "{{ matrix_riot_web_data_path }}/docker-src"
matrix_riot_web_docker_src_files_path: "{{ matrix_riot_web_data_path }}/docker-src"
# Controls whether the matrix-riot-web container exposes its HTTP port (tcp/8080 in the container).
#

6
roles/matrix-riot-web/tasks/setup_riot_web.yml
View File

@ -13,7 +13,7 @@
group: "{{ matrix_user_username }}"
with_items:
- "{{ matrix_riot_web_data_path }}"
- { src: "{{ matrix_docker_riot_web_src_files_path }}", when: "{{ matrix_riot_web_self_build }}" }
- { src: "{{ matrix_riot_web_docker_src_files_path }}", when: "{{ matrix_riot_web_self_build }}" }
when: matrix_riot_web_enabled|bool
- name: Ensure riot-web Docker image is pulled
@ -27,7 +27,7 @@
- name: Ensure Riot Web repository is present on self-build
git:
repo: https://github.com/vector-im/riot-web.git
dest: "{{ matrix_docker_riot_web_src_files_path }}"
dest: "{{ matrix_riot_web_docker_src_files_path }}"
version: "v{{ matrix_riot_web_docker_image.split(':')[1] }}"
force: "yes"
when: "matrix_riot_web_enabled|bool and matrix_riot_web_self_build"
@ -38,7 +38,7 @@
source: build
build:
dockerfile: Dockerfile
path: "{{ matrix_docker_riot_web_src_files_path }}"
path: "{{ matrix_riot_web_docker_src_files_path }}"
pull: yes
when: "matrix_riot_web_enabled|bool and matrix_self_build"