Merge branch 'master' into make-etherpad-great-again

roles/custom/matrix-etherpad/tasks/setup_install.yml

@@ -23,14 +23,14 @@
     force_source: "{{ matrix_etherpad_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_etherpad_docker_image_force_pull }}"
   register: result
-  retries: "{{ matrix_container_retries_count }}"
-  delay: "{{ matrix_container_retries_delay }}"
+  retries: "{{ devture_playbook_help_container_retries_count }}"
+  delay: "{{ devture_playbook_help_container_retries_delay }}"
   until: result is not failed
 
 - name: Ensure matrix-etherpad.service installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/systemd/matrix-etherpad.service.j2"
-    dest: "{{ matrix_systemd_path }}/matrix-etherpad.service"
+    dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-etherpad.service"
     mode: 0644
   register: matrix_etherpad_systemd_service_result
 

roles/custom/matrix-etherpad/tasks/setup_uninstall.yml

@@ -2,7 +2,7 @@
 
 - name: Check existence of matrix-etherpad service
   ansible.builtin.stat:
-    path: "{{ matrix_systemd_path }}/matrix-etherpad.service"
+    path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-etherpad.service"
   register: matrix_etherpad_service_stat
 
 - name: Ensure matrix-etherpad is stopped
@@ -16,7 +16,7 @@
 
 - name: Ensure matrix-etherpad.service doesn't exist
   ansible.builtin.file:
-    path: "{{ matrix_systemd_path }}/matrix-etherpad.service"
+    path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-etherpad.service"
     state: absent
   when: "matrix_etherpad_service_stat.stat.exists | bool"