diff --git a/files/systemd/override.conf b/files/systemd/override.conf new file mode 100644 index 0000000..168f32c --- /dev/null +++ b/files/systemd/override.conf @@ -0,0 +1,4 @@ +# Ansible manages + +[Service] +Restart=always diff --git a/handlers/main.yml b/handlers/main.yml index cca4624..468c396 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -9,7 +9,6 @@ name: mariadb state: restarted -- name: reload monit - service: - name: monit - state: reloaded +- name: Reload systemd + ansible.builtin.systemd: + daemon_reload: true diff --git a/tasks/configuration.yml b/tasks/configuration.yml index 6474d7e..aa0980a 100644 --- a/tasks/configuration.yml +++ b/tasks/configuration.yml @@ -5,3 +5,12 @@ dest: "/etc/mysql/mariadb.conf.d/90-{{ ansible_hostname }}.cnf" mode: "0644" notify: restart mariadb + +- name: "Configuration | Copy systemd override" + ansible.builtin.file: + src: systemd/override.conf + dest: /etc/systemd/systemd/mariadb.service.d/ + mode: "0644" + notify: + - Reload systemd + - restart mariadb diff --git a/tasks/main.yml b/tasks/main.yml index 771998a..87cc169 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -16,11 +16,6 @@ ansible.builtin.import_tasks: backup.yml tags: backup -- name: Monit - ansible.builtin.import_tasks: monit.yml - when: "'monit' in ansible_facts.packages" - tags: monit - - name: Configuration ansible.builtin.import_tasks: configuration.yml tags: configuration diff --git a/tasks/monit.yml b/tasks/monit.yml deleted file mode 100644 index 07b1031..0000000 --- a/tasks/monit.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- name: "Monit | Create sql user" - community.mysql.mysql_user: - name: "{{ monit_sql_user }}" - password: "{{ monit_sql_password }}" - state: present - login_unix_socket: "{{ mysql_socket }}" - login_user: root - -- name: "Monit | Copy Monit configuration" - ansible.builtin.template: - src: monit.conf.j2 - dest: /etc/monit/conf-enabled/mariadb - mode: "0600" - notify: reload monit