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-mxisd/defaults/main.yml
View File

@ -8,7 +8,7 @@ matrix_mxisd_docker_image: "kamax/mxisd:1.4.6"
matrix_mxisd_docker_image_force_pull: "{{ matrix_mxisd_docker_image.endswith(':latest') }}"
matrix_mxisd_base_path: "{{ matrix_base_data_path }}/mxisd"
matrix_docker_mxisd_src_files_path: "{{ matrix_mxisd_base_path }}/docker-src"
matrix_mxisd_docker_src_files_path: "{{ matrix_mxisd_base_path }}/docker-src"
matrix_mxisd_config_path: "{{ matrix_mxisd_base_path }}/config"
matrix_mxisd_data_path: "{{ matrix_mxisd_base_path }}/data"

6
roles/matrix-mxisd/tasks/setup_mxisd.yml
View File

@ -14,7 +14,7 @@
with_items:
- "{{ matrix_mxisd_config_path }}"
- "{{ matrix_mxisd_data_path }}"
- { src: "{{ matrix_docker_mxisd_src_files_path }}", when: "{{ matrix_mxisd_self_build }}"}
- { src: "{{ matrix_mxisd_docker_src_files_path }}", when: "{{ matrix_mxisd_self_build }}"}
when: matrix_mxisd_enabled|bool
- name: Ensure mxisd image is pulled
@ -36,7 +36,7 @@
- name: Ensure mxisd repository is present on self-build
git:
repo: https://github.com/kamax-matrix/mxisd.git
dest: "{{ matrix_docker_mxisd_src_files_path }}"
dest: "{{ matrix_mxisd_docker_src_files_path }}"
version: "v{{ matrix_mxisd_docker_image.split(':')[1] }}"
force: "yes"
when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
@ -44,7 +44,7 @@
- name: Ensure mxisd Docker image is build
shell: "./gradlew dockerBuild"
args:
chdir: "{{ matrix_docker_mxisd_src_files_path }}"
chdir: "{{ matrix_mxisd_docker_src_files_path }}"
when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
- name: Ensure mxisd config installed