From ce697edcc9d0b217365561a6d9a9c8c9155f32ed Mon Sep 17 00:00:00 2001 From: sonny Date: Sat, 3 Aug 2024 15:18:18 +0200 Subject: [PATCH] Use handlers --- handlers.yml | 29 +++++++++++++++++++++++++++++ tasks/docker.yml | 12 ++---------- tasks/mpd.yml | 9 ++------- tasks/nginx.yml | 1 + tasks/radicale.yml | 10 ++-------- tasks/syncthing.yml | 8 +------- 6 files changed, 37 insertions(+), 32 deletions(-) diff --git a/handlers.yml b/handlers.yml index 568c3b8..9ac4d73 100644 --- a/handlers.yml +++ b/handlers.yml @@ -4,3 +4,32 @@ name: systemd-networkd state: restarted enabled: true + +- name: restart docker service + become: true + systemd: + name: docker.service + state: restarted + enabled: true + +- name: restart radicale service + become: true + systemd: + name: radicale + state: restarted + enabled: true + daemon_reload: true + +- name: restart syncthing service + systemd: + name: syncthing + state: restarted + enabled: true + scope: user + +- name: restart mpd service + systemd: + name: mpd + state: restarted + enabled: true + scope: user diff --git a/tasks/docker.yml b/tasks/docker.yml index 925e3e4..a3bfc71 100644 --- a/tasks/docker.yml +++ b/tasks/docker.yml @@ -18,7 +18,7 @@ loop: - { src: 'files/docker/apt.gpg', dest: '/etc/apt/keyrings/docker.gpg' } - { src: 'files/docker/config.json', dest: '/etc/docker/daemon.json' } - register: docker_config + notify: restart docker service - name: 'install docker apt source' become: true @@ -36,12 +36,4 @@ - docker-ce-cli - containerd.io - docker-compose-plugin - register: docker_install - -- name: restart docker service - become: true - systemd: - name: docker.service - state: restarted - enabled: true - when: docker_config.changed or docker_install.changed + notify: restart docker service diff --git a/tasks/mpd.yml b/tasks/mpd.yml index 40e8b77..709ecf2 100644 --- a/tasks/mpd.yml +++ b/tasks/mpd.yml @@ -3,6 +3,7 @@ src: 'templates/mpd.j2' dest: '{{ ansible_env.HOME }}/.config/mpd/mpd.conf' mode: '0640' + notify: restart mpd service - name: created mpd files file: @@ -12,10 +13,4 @@ - '{{ ansible_env.HOME }}/.config/mpd/db' - '{{ ansible_env.HOME }}/.config/mpd/state' - '{{ ansible_env.HOME }}/.config/mpd/sticker.sql' - -- name: restart mpd service - systemd: - name: mpd - state: restarted - enabled: true - scope: user + notify: restart mpd service diff --git a/tasks/nginx.yml b/tasks/nginx.yml index f271187..15141f9 100644 --- a/tasks/nginx.yml +++ b/tasks/nginx.yml @@ -41,5 +41,6 @@ src: '/etc/nginx/sites-available/newsreader', dest: '/etc/nginx/sites-enabled/newsreader', } + notify: restart nginx # TODO: provision certbot configuration diff --git a/tasks/radicale.yml b/tasks/radicale.yml index 55b4675..ee5c278 100644 --- a/tasks/radicale.yml +++ b/tasks/radicale.yml @@ -32,6 +32,7 @@ name: radicale state: present virtualenv: '/usr/local/lib/radicale/env' + notify: restart radicale service - name: create radicale directories become: true @@ -112,11 +113,4 @@ owner: 'root', group: 'root', } - -- name: restart radicale service - become: true - systemd: - name: radicale - state: restarted - enabled: true - daemon_reload: true + notify: restart radicale service diff --git a/tasks/syncthing.yml b/tasks/syncthing.yml index 2e4c3bf..7fd7ff9 100644 --- a/tasks/syncthing.yml +++ b/tasks/syncthing.yml @@ -3,10 +3,4 @@ src: 'templates/syncthing.j2' dest: '{{ ansible_env.HOME }}/.config/syncthing/config.xml' mode: '0600' - -- name: restart syncthing service - systemd: - name: syncthing - state: restarted - enabled: true - scope: user + notify: restart syncthing service