Split install/uninstall tasks in matrix-coturn

roles/matrix-coturn/tasks/main.yml

@@ -8,8 +8,14 @@
     - setup-all
     - setup-coturn
 
-- import_tasks: "{{ role_path }}/tasks/setup_coturn.yml"
+- import_tasks: "{{ role_path }}/tasks/setup_install.yml"
-  when: run_setup|bool
+  when: "run_setup|bool and matrix_coturn_enabled|bool"
+  tags:
+    - setup-all
+    - setup-coturn
+
+- import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
+  when: "run_setup|bool and not matrix_coturn_enabled|bool"
   tags:
     - setup-all
     - setup-coturn

roles/matrix-coturn/tasks/setup_install.yml

@@ -1,9 +1,5 @@
 ---
 
-#
-# Tasks related to setting up Coturn
-#
-
 - name: Ensure Matrix Coturn path exists
   file:
     path: "{{ item.path }}"
@@ -13,7 +9,7 @@
     group: "{{ matrix_user_groupname }}"
   with_items:
     - { path: "{{ matrix_coturn_docker_src_files_path }}", when: "{{ matrix_coturn_container_image_self_build }}"}
-  when: matrix_coturn_enabled|bool and item.when
+  when: "item.when|bool"
 
 - name: Ensure Coturn image is pulled
   docker_image:
@@ -21,7 +17,7 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_coturn_docker_image_force_pull 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_coturn_docker_image_force_pull }}"
-  when: matrix_coturn_enabled|bool and not matrix_coturn_container_image_self_build
+  when: "not matrix_coturn_container_image_self_build|bool"
 
 - name: Ensure Coturn repository is present on self-build
   git:
@@ -30,7 +26,7 @@
     version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
     force: "yes"
   register: matrix_coturn_git_pull_results
-  when: "matrix_coturn_enabled|bool and matrix_coturn_container_image_self_build"
+  when: "matrix_coturn_container_image_self_build|bool"
 
 - name: Ensure Coturn Docker image is built
   docker_image:
@@ -41,7 +37,7 @@
       dockerfile: Dockerfile
       path: "{{ matrix_coturn_docker_src_files_path }}"
       pull: yes
-  when: "matrix_coturn_enabled|bool and matrix_coturn_container_image_self_build|bool"
+  when: "matrix_coturn_container_image_self_build|bool"
 
 - name: Ensure Coturn configuration path exists
   file:
@@ -50,20 +46,17 @@
     mode: 0750
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
-  when: matrix_coturn_enabled|bool
 
 - name: Ensure turnserver.conf installed
   template:
     src: "{{ role_path }}/templates/turnserver.conf.j2"
     dest: "{{ matrix_coturn_config_path }}"
     mode: 0644
-  when: matrix_coturn_enabled|bool
 
 - name: Ensure Coturn network is created in Docker
   docker_network:
     name: "{{ matrix_coturn_docker_network }}"
     driver: bridge
-  when: matrix_coturn_enabled|bool
 
 - name: Ensure matrix-coturn.service installed
   template:
@@ -71,12 +64,11 @@
     dest: "{{ matrix_systemd_path }}/matrix-coturn.service"
     mode: 0644
   register: matrix_coturn_systemd_service_result
-  when: matrix_coturn_enabled|bool
 
 - name: Ensure systemd reloaded after matrix-coturn.service installation
   service:
     daemon_reload: yes
-  when: "matrix_coturn_enabled|bool and matrix_coturn_systemd_service_result.changed"
+  when: "matrix_coturn_systemd_service_result.changed"
 
 # This may be unnecessary when more long-lived certificates are used.
 # We optimize for the common use-case though (short-lived Let's Encrypt certificates).
@@ -86,52 +78,11 @@
     src: "{{ role_path }}/templates/cron.d/matrix-coturn-ssl-reload.j2"
     dest: /etc/cron.d/matrix-coturn-ssl-reload
     mode: 0644
-  when: "matrix_coturn_enabled|bool and matrix_coturn_tls_enabled|bool"
+  when: "matrix_coturn_tls_enabled|bool"
-
-
-#
-# Tasks related to getting rid of Coturn (if it was previously enabled)
-#
 
+# A similar task exists in `setup_uninstall.yml`
 - name: Ensure matrix-coturn-ssl-reload cronjob removed
   file:
     path: /etc/cron.d/matrix-coturn-ssl-reload
     state: absent
-  when: "not matrix_coturn_enabled|bool or not matrix_coturn_tls_enabled|bool"
+  when: "not matrix_coturn_tls_enabled|bool"
-
-- name: Check existence of matrix-coturn service
-  stat:
-    path: "{{ matrix_systemd_path }}/matrix-coturn.service"
-  register: matrix_coturn_service_stat
-  when: "not matrix_coturn_enabled|bool"
-
-- name: Ensure matrix-coturn is stopped
-  service:
-    name: matrix-coturn
-    state: stopped
-    daemon_reload: yes
-  register: stopping_result
-  when: "not matrix_coturn_enabled|bool and matrix_coturn_service_stat.stat.exists"
-
-- name: Ensure matrix-coturn.service doesn't exist
-  file:
-    path: "{{ matrix_systemd_path }}/matrix-coturn.service"
-    state: absent
-  when: "not matrix_coturn_enabled|bool and matrix_coturn_service_stat.stat.exists"
-
-- name: Ensure systemd reloaded after matrix-coturn.service removal
-  service:
-    daemon_reload: yes
-  when: "not matrix_coturn_enabled|bool and matrix_coturn_service_stat.stat.exists"
-
-- name: Ensure Matrix coturn paths don't exist
-  file:
-    path: "{{ matrix_coturn_base_path }}"
-    state: absent
-  when: "not matrix_coturn_enabled|bool"
-
-- name: Ensure coturn Docker image doesn't exist
-  docker_image:
-    name: "{{ matrix_coturn_docker_image }}"
-    state: absent
-  when: "not matrix_coturn_enabled|bool"

roles/matrix-coturn/tasks/setup_uninstall.yml

@@ -0,0 +1,44 @@
+---
+
+# A similar task exists in `setup_install.yml`
+- name: Ensure matrix-coturn-ssl-reload cronjob removed
+  file:
+    path: /etc/cron.d/matrix-coturn-ssl-reload
+    state: absent
+
+- name: Check existence of matrix-coturn service
+  stat:
+    path: "{{ matrix_systemd_path }}/matrix-coturn.service"
+  register: matrix_coturn_service_stat
+  when: "not matrix_coturn_enabled|bool"
+
+- name: Ensure matrix-coturn is stopped
+  service:
+    name: matrix-coturn
+    state: stopped
+    daemon_reload: yes
+  register: stopping_result
+  when: "not matrix_coturn_enabled|bool and matrix_coturn_service_stat.stat.exists"
+
+- name: Ensure matrix-coturn.service doesn't exist
+  file:
+    path: "{{ matrix_systemd_path }}/matrix-coturn.service"
+    state: absent
+  when: "not matrix_coturn_enabled|bool and matrix_coturn_service_stat.stat.exists"
+
+- name: Ensure systemd reloaded after matrix-coturn.service removal
+  service:
+    daemon_reload: yes
+  when: "not matrix_coturn_enabled|bool and matrix_coturn_service_stat.stat.exists"
+
+- name: Ensure Matrix coturn paths don't exist
+  file:
+    path: "{{ matrix_coturn_base_path }}"
+    state: absent
+  when: "not matrix_coturn_enabled|bool"
+
+- name: Ensure coturn Docker image doesn't exist
+  docker_image:
+    name: "{{ matrix_coturn_docker_image }}"
+    state: absent
+  when: "not matrix_coturn_enabled|bool"