diff --git a/roles/matrix-corporal/tasks/setup_corporal.yml b/roles/matrix-corporal/tasks/setup_corporal.yml index f1fd2d9b..0bfba48a 100644 --- a/roles/matrix-corporal/tasks/setup_corporal.yml +++ b/roles/matrix-corporal/tasks/setup_corporal.yml @@ -34,18 +34,54 @@ src: "{{ role_path }}/templates/systemd/matrix-corporal.service.j2" dest: "/etc/systemd/system/matrix-corporal.service" mode: 0644 + register: matrix_corporal_systemd_service_result when: "matrix_corporal_enabled" +- name: Ensure systemd reloaded after matrix-corporal.service installation + service: + daemon_reload: yes + when: "matrix_corporal_enabled and matrix_corporal_systemd_service_result.changed" + # # Tasks related to getting rid of matrix-corporal (if it was previously enabled) # +- name: Check existence of matrix-corporal service + stat: + path: "/etc/systemd/system/matrix-corporal.service" + register: matrix_corporal_service_stat + +- name: Ensure matrix-corporal is stopped + service: + name: matrix-corporal + state: stopped + daemon_reload: yes + register: stopping_result + when: "not matrix_corporal_enabled and matrix_corporal_service_stat.stat.exists" + +- name: Ensure matrix-corporal.service doesn't exist + file: + path: "/etc/systemd/system/matrix-corporal.service" + state: absent + when: "not matrix_corporal_enabled and matrix_corporal_service_stat.stat.exists" + +- name: Ensure systemd reloaded after matrix-corporal.service removal + service: + daemon_reload: yes + when: "not matrix_corporal_enabled and matrix_corporal_service_stat.stat.exists" + - name: Ensure matrix-corporal files don't exist file: path: "{{ item }}" state: absent - when: "not matrix_corporal_enabled" with_items: - /etc/systemd/system/matrix-corporal.service - "{{ matrix_corporal_config_dir_path }}/config.json" + when: "not matrix_corporal_enabled" + +- name: Ensure Matrix Corporal Docker image doesn't exist + docker_image: + name: "{{ matrix_corporal_docker_image }}" + state: absent + when: "not matrix_corporal_enabled" diff --git a/roles/matrix-coturn/tasks/setup_coturn.yml b/roles/matrix-coturn/tasks/setup_coturn.yml index fbbabaa6..5dd0db41 100644 --- a/roles/matrix-coturn/tasks/setup_coturn.yml +++ b/roles/matrix-coturn/tasks/setup_coturn.yml @@ -30,8 +30,14 @@ src: "{{ role_path }}/templates/systemd/matrix-coturn.service.j2" dest: "/etc/systemd/system/matrix-coturn.service" mode: 0644 + register: matrix_coturn_systemd_service_result when: matrix_coturn_enabled +- name: Ensure systemd reloaded after matrix-coturn.service installation + service: + daemon_reload: yes + when: "matrix_coturn_enabled and matrix_coturn_systemd_service_result.changed" + - name: Allow access to Coturn ports in firewalld firewalld: port: "{{ item }}" @@ -67,6 +73,11 @@ state: absent when: "not matrix_coturn_enabled 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 and matrix_coturn_service_stat.stat.exists" + - name: Ensure Matrix coturn paths don't exist file: path: "{{ matrix_coturn_base_path }}" @@ -77,4 +88,4 @@ docker_image: name: "{{ matrix_coturn_docker_image }}" state: absent - when: "not matrix_coturn_enabled" \ No newline at end of file + when: "not matrix_coturn_enabled" diff --git a/roles/matrix-mailer/tasks/setup_mailer.yml b/roles/matrix-mailer/tasks/setup_mailer.yml index 7155556c..9f57f8b7 100644 --- a/roles/matrix-mailer/tasks/setup_mailer.yml +++ b/roles/matrix-mailer/tasks/setup_mailer.yml @@ -30,8 +30,14 @@ src: "{{ role_path }}/templates/systemd/matrix-mailer.service.j2" dest: "/etc/systemd/system/matrix-mailer.service" mode: 0644 + register: matrix_mailer_systemd_service_result when: matrix_mailer_enabled +- name: Ensure systemd reloaded after matrix-mailer.service installation + service: + daemon_reload: yes + when: "matrix_mailer_enabled and matrix_mailer_systemd_service_result.changed" + # # Tasks related to getting rid of the mailer (if it was previously enabled) # @@ -55,6 +61,11 @@ state: absent when: "not matrix_mailer_enabled and matrix_mailer_service_stat.stat.exists" +- name: Ensure systemd reloaded after matrix-mailer.service removal + service: + daemon_reload: yes + when: "not matrix_mailer_enabled and matrix_mailer_service_stat.stat.exists" + - name: Ensure Matrix mailer environment variables path doesn't exist file: path: "{{ matrix_mailer_base_path }}" diff --git a/roles/matrix-mxisd/tasks/setup_mxisd.yml b/roles/matrix-mxisd/tasks/setup_mxisd.yml index 8d81e47c..e10d79f6 100644 --- a/roles/matrix-mxisd/tasks/setup_mxisd.yml +++ b/roles/matrix-mxisd/tasks/setup_mxisd.yml @@ -35,8 +35,14 @@ src: "{{ role_path }}/templates/systemd/matrix-mxisd.service.j2" dest: "/etc/systemd/system/matrix-mxisd.service" mode: 0644 + register: matrix_mxisd_systemd_service_result when: matrix_mxisd_enabled +- name: Ensure systemd reloaded after matrix-mxisd.service installation + service: + daemon_reload: yes + when: "matrix_mxisd_enabled and matrix_mxisd_systemd_service_result.changed" + # # Tasks related to getting rid of mxisd (if it was previously enabled) # @@ -60,6 +66,11 @@ state: absent when: "not matrix_mxisd_enabled and matrix_mxisd_service_stat.stat.exists" +- name: Ensure systemd reloaded after matrix-mxisd.service removal + service: + daemon_reload: yes + when: "not matrix_mxisd_enabled and matrix_mxisd_service_stat.stat.exists" + - name: Ensure Matrix mxisd paths don't exist file: path: "{{ matrix_mxisd_base_path }}" diff --git a/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml b/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml index 0a67a457..b6aacab2 100644 --- a/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml +++ b/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml @@ -90,8 +90,14 @@ src: "{{ role_path }}/templates/systemd/matrix-nginx-proxy.service.j2" dest: "/etc/systemd/system/matrix-nginx-proxy.service" mode: 0644 + register: matrix_nginx_proxy_systemd_service_result when: matrix_nginx_proxy_enabled +- name: Ensure systemd reloaded after matrix-nginx-proxy.service installation + service: + daemon_reload: yes + when: "matrix_nginx_proxy_enabled and matrix_nginx_proxy_systemd_service_result.changed" + # # Tasks related to getting rid of matrix-nginx-proxy (if it was previously enabled) @@ -116,6 +122,11 @@ state: absent when: "not matrix_nginx_proxy_enabled and matrix_nginx_proxy_service_stat.stat.exists" +- name: Ensure systemd reloaded after matrix-nginx-proxy.service removal + service: + daemon_reload: yes + when: "not matrix_nginx_proxy_enabled and matrix_nginx_proxy_service_stat.stat.exists" + - name: Ensure Matrix nginx-proxy configuration for matrix domain deleted file: path: "{{ matrix_nginx_proxy_confd_path }}/matrix-synapse.conf" diff --git a/roles/matrix-postgres/tasks/setup_postgres.yml b/roles/matrix-postgres/tasks/setup_postgres.yml index 2b83d4aa..e22e1024 100644 --- a/roles/matrix-postgres/tasks/setup_postgres.yml +++ b/roles/matrix-postgres/tasks/setup_postgres.yml @@ -76,8 +76,14 @@ src: "{{ role_path }}/templates/systemd/matrix-postgres.service.j2" dest: "/etc/systemd/system/matrix-postgres.service" mode: 0644 + register: matrix_postgres_systemd_service_result when: matrix_postgres_enabled +- name: Ensure systemd reloaded after matrix-postgres.service installation + service: + daemon_reload: yes + when: "matrix_postgres_enabled and matrix_postgres_systemd_service_result.changed" + # # Tasks related to getting rid of the internal postgres server (if it was previously enabled) # @@ -101,6 +107,11 @@ state: absent when: "not matrix_postgres_enabled and matrix_postgres_service_stat.stat.exists" +- name: Ensure systemd reloaded after matrix-postgres.service removal + service: + daemon_reload: yes + when: "not matrix_postgres_enabled and matrix_postgres_service_stat.stat.exists" + - name: Check existence of matrix-postgres local data path stat: path: "{{ matrix_postgres_data_path }}" diff --git a/roles/matrix-riot-web/tasks/setup_riot_web.yml b/roles/matrix-riot-web/tasks/setup_riot_web.yml index 94863a8c..9828ae2a 100644 --- a/roles/matrix-riot-web/tasks/setup_riot_web.yml +++ b/roles/matrix-riot-web/tasks/setup_riot_web.yml @@ -44,8 +44,14 @@ src: "{{ role_path }}/templates/systemd/matrix-riot-web.service.j2" dest: "/etc/systemd/system/matrix-riot-web.service" mode: 0644 + register: matrix_riot_web_systemd_service_result when: matrix_riot_web_enabled +- name: Ensure systemd reloaded after matrix-riot-web.service installation + service: + daemon_reload: yes + when: "matrix_riot_web_enabled and matrix_riot_web_systemd_service_result.changed" + # # Tasks related to getting rid of riot-web (if it was previously enabled) # @@ -69,6 +75,11 @@ state: absent when: "not matrix_riot_web_enabled and matrix_riot_web_service_stat.stat.exists" +- name: Ensure systemd reloaded after matrix-riot-web.service removal + service: + daemon_reload: yes + when: "not matrix_riot_web_enabled and matrix_riot_web_service_stat.stat.exists" + - name: Ensure Matrix riot-web paths doesn't exist file: path: "{{ matrix_riot_web_data_path }}" diff --git a/roles/matrix-synapse/tasks/ext/appservice-irc/setup.yml b/roles/matrix-synapse/tasks/ext/appservice-irc/setup.yml index 79d800a0..7a18e044 100644 --- a/roles/matrix-synapse/tasks/ext/appservice-irc/setup.yml +++ b/roles/matrix-synapse/tasks/ext/appservice-irc/setup.yml @@ -35,8 +35,14 @@ src: "{{ role_path }}/templates/ext/appservice-irc/systemd/matrix-appservice-irc.service.j2" dest: "/etc/systemd/system/matrix-appservice-irc.service" mode: 0644 + register: matrix_appservice_irc_systemd_service_result when: "matrix_appservice_irc_enabled" +- name: Ensure systemd reloaded after matrix-appservice-irc.service installation + service: + daemon_reload: yes + when: "matrix_appservice_irc_enabled and matrix_appservice_irc_systemd_service_result.changed" + - stat: path: "{{ matrix_appservice_irc_base_path }}/registration.yaml" register: appservice_irc_registration_file diff --git a/roles/matrix-synapse/tasks/ext/mautrix-telegram/setup.yml b/roles/matrix-synapse/tasks/ext/mautrix-telegram/setup.yml index 51a68336..8c2c3cd5 100644 --- a/roles/matrix-synapse/tasks/ext/mautrix-telegram/setup.yml +++ b/roles/matrix-synapse/tasks/ext/mautrix-telegram/setup.yml @@ -44,8 +44,14 @@ src: "{{ role_path }}/templates/ext/mautrix-telegram/systemd/matrix-mautrix-telegram.service.j2" dest: "/etc/systemd/system/matrix-mautrix-telegram.service" mode: 0644 + register: matrix_mautrix_telegram_systemd_service_result when: "matrix_mautrix_telegram_enabled" +- name: Ensure systemd reloaded after matrix-mautrix-telegram.service installation + service: + daemon_reload: yes + when: "matrix_mautrix_telegram_enabled and matrix_mautrix_telegram_systemd_service_result.changed" + - name: Check if a mautrix-telegram registration file exists stat: path: "{{ matrix_mautrix_telegram_base_path }}/registration.yaml" diff --git a/roles/matrix-synapse/tasks/ext/mautrix-whatsapp/setup.yml b/roles/matrix-synapse/tasks/ext/mautrix-whatsapp/setup.yml index 3c22c62c..5c0bc033 100644 --- a/roles/matrix-synapse/tasks/ext/mautrix-whatsapp/setup.yml +++ b/roles/matrix-synapse/tasks/ext/mautrix-whatsapp/setup.yml @@ -33,8 +33,14 @@ src: "{{ role_path }}/templates/ext/mautrix-whatsapp/systemd/matrix-mautrix-whatsapp.service.j2" dest: "/etc/systemd/system/matrix-mautrix-whatsapp.service" mode: 0644 + register: matrix_mautrix_whatsapp_systemd_service_result when: "matrix_mautrix_whatsapp_enabled" +- name: Ensure systemd reloaded after matrix-mautrix-whatsapp.service installation + service: + daemon_reload: yes + when: "matrix_mautrix_whatsapp_enabled and matrix_mautrix_whatsapp_systemd_service_result.changed" + - name: Check if a mautrix-whatsapp registration file exists stat: path: "{{ matrix_mautrix_whatsapp_base_path }}/registration.yaml" diff --git a/roles/matrix-synapse/tasks/setup_synapse_goofys.yml b/roles/matrix-synapse/tasks/setup_synapse_goofys.yml index f37a1eb6..ae4349cd 100644 --- a/roles/matrix-synapse/tasks/setup_synapse_goofys.yml +++ b/roles/matrix-synapse/tasks/setup_synapse_goofys.yml @@ -37,8 +37,14 @@ src: "{{ role_path }}/templates/goofys/systemd/matrix-goofys.service.j2" dest: "/etc/systemd/system/matrix-goofys.service" mode: 0644 + register: matrix_goofys_systemd_service_result when: matrix_s3_media_store_enabled +- name: Ensure systemd reloaded after matrix-goofys.service installation + service: + daemon_reload: yes + when: "matrix_s3_media_store_enabled and matrix_goofys_systemd_service_result.changed" + # # Tasks related to getting rid of goofys (if it was previously enabled) # @@ -62,6 +68,11 @@ state: absent when: "not matrix_s3_media_store_enabled and matrix_goofys_service_stat.stat.exists" +- name: Ensure systemd reloaded after matrix-goofys.service removal + service: + daemon_reload: yes + when: "not matrix_s3_media_store_enabled and matrix_goofys_service_stat.stat.exists" + - name: Ensure goofys environment variables file doesn't exist file: path: "{{ matrix_synapse_config_dir_path }}/env-goofys" diff --git a/roles/matrix-synapse/tasks/setup_synapse_main.yml b/roles/matrix-synapse/tasks/setup_synapse_main.yml index f5199540..e2d7baea 100644 --- a/roles/matrix-synapse/tasks/setup_synapse_main.yml +++ b/roles/matrix-synapse/tasks/setup_synapse_main.yml @@ -64,6 +64,12 @@ src: "{{ role_path }}/templates/synapse/systemd/matrix-synapse.service.j2" dest: "/etc/systemd/system/matrix-synapse.service" mode: 0644 + register: matrix_synapse_systemd_service_result + +- name: Ensure systemd reloaded after matrix-synapse.service installation + service: + daemon_reload: yes + when: matrix_synapse_systemd_service_result.changed - name: Ensure matrix-synapse-register-user script created template: