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

refactor based on Slavi's requests

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

10
roles/matrix-base/defaults/main.yml
View File

@ -26,13 +26,6 @@ matrix_base_data_path: "/matrix"
matrix_base_data_path_mode: "750"
matrix_static_files_base_path: "{{ matrix_base_data_path }}/static-files"
matrix_docker_src_files_path: "{{ matrix_base_data_path }}/docker-src"
matrix_docker_synapse_src_files_path: "{{ matrix_docker_src_files_path }}/synapse"
matrix_docker_riot_web_src_files_path: "{{ matrix_docker_src_files_path }}/riot-web"
matrix_docker_coturn_src_files_path: "{{ matrix_docker_src_files_path }}/coturn"
matrix_docker_mxisd_src_files_path: "{{ matrix_docker_src_files_path }}/mxisd"
matrix_docker_mautrix_facebook_src_files_path: "{{ matrix_docker_src_files_path }}/mautrix-facebook"
matrix_docker_mautrix_hangouts_src_files_path: "{{ matrix_docker_src_files_path }}/mautrix-hangouts"
matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"
@ -73,3 +66,6 @@ run_setup: true
run_self_check: true
run_start: true
run_stop: true
# Raspberry pi depoly TODO: it should be identified based on the operating system
matrix_raspberry_pi_deploy: false

2
roles/matrix-base/tasks/server_base/setup.yml
View File

@ -7,7 +7,7 @@
when: (ansible_os_family == 'Debian') and (ansible_lsb.id != 'Raspbian')
- include_tasks: "{{ role_path }}/tasks/server_base/setup_raspbian.yml"
when: "matrix_raspberry_pi"
when: "matrix_raspberry_pi_deploy"
- name: Ensure Docker is started and autoruns
service:

7
roles/matrix-base/tasks/setup_matrix_base.yml
View File

@ -22,13 +22,6 @@
group: "{{ matrix_user_username }}"
with_items:
- "{{ matrix_base_data_path }}"
- { src: "{{ matrix_docker_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
- { src: "{{ matrix_docker_synapse_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
- { src: "{{ matrix_docker_riot_web_src_files_path }}", when: "{{ matrix_raspberry_pi }}" }
- { src: "{{ matrix_docker_coturn_src_files_path }}", when: "{{ matrix_coturn_enabled }}"}
- { src: "{{ matrix_docker_mxisd_src_files_path }}", when: "{{ matrix_mxisd_enabled }}"}
- { src: "{{ matrix_docker_mautrix_facebook_src_files_path }}", when: "{{ matrix_mautrix_facebook_enabled }}"}
- { src: "{{ matrix_docker_mautrix_hangouts_src_files_path }}", when: "{{ matrix_mautrix_hangouts_enabled }}"}
# `docker_network` doesn't work as expected when the given network
# is a substring of a network that already exists.