From 4189c5d2dafc2c76fbec4aea3e9c953f512b0bbb Mon Sep 17 00:00:00 2001 From: Andrew Pollicina Date: Wed, 29 Jul 2020 15:51:04 +1000 Subject: [PATCH 1/3] add service start and enable --- tasks/main.yml | 3 +++ tasks/service.yml | 6 ++++++ vars/debian.yml | 1 + vars/redhat.yml | 1 + 4 files changed, 11 insertions(+) create mode 100644 tasks/service.yml diff --git a/tasks/main.yml b/tasks/main.yml index 77c7a22..79abfb2 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -12,3 +12,6 @@ - include: monitors.yml tags: monit_monitors + +- include: service.yml + tags: monit_service \ No newline at end of file diff --git a/tasks/service.yml b/tasks/service.yml new file mode 100644 index 0000000..38d14ce --- /dev/null +++ b/tasks/service.yml @@ -0,0 +1,6 @@ +--- +- name: service - ensure running and enabled + service: + name: "{{ monit_service }}" + state: started + enabled: yes diff --git a/vars/debian.yml b/vars/debian.yml index d02a2c3..378050f 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -1,3 +1,4 @@ --- +monit_service: monit monitrc_conf: /etc/monit/monitrc monit_includes: /etc/monit/conf.d \ No newline at end of file diff --git a/vars/redhat.yml b/vars/redhat.yml index d876cfd..89e5615 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -1,3 +1,4 @@ --- +monit_service: monit monitrc_conf: /etc/monitrc monit_includes: /etc/monit.d From b06293af51663ad08867c71381c9df772838612d Mon Sep 17 00:00:00 2001 From: Andrew Pollicina Date: Wed, 29 Jul 2020 16:00:22 +1000 Subject: [PATCH 2/3] add new lines at end of files --- tasks/main.yml | 2 +- tasks/service.yml | 1 + vars/debian.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 79abfb2..4b3f3c0 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -14,4 +14,4 @@ tags: monit_monitors - include: service.yml - tags: monit_service \ No newline at end of file + tags: monit_service diff --git a/tasks/service.yml b/tasks/service.yml index 38d14ce..7e4a27a 100644 --- a/tasks/service.yml +++ b/tasks/service.yml @@ -4,3 +4,4 @@ name: "{{ monit_service }}" state: started enabled: yes + diff --git a/vars/debian.yml b/vars/debian.yml index 378050f..b9a97e6 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -1,4 +1,4 @@ --- monit_service: monit monitrc_conf: /etc/monit/monitrc -monit_includes: /etc/monit/conf.d \ No newline at end of file +monit_includes: /etc/monit/conf.d From e137c19b191432440b7a1f7589871ce86df2e3b6 Mon Sep 17 00:00:00 2001 From: Andrew Pollicina Date: Tue, 9 Jul 2024 08:29:29 +1000 Subject: [PATCH 3/3] move to include_tasks --- tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 4b3f3c0..d3012df 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,17 +1,17 @@ --- -- include: debian/pkg.yml +- include_tasks: debian/pkg.yml tags: monit_pkg when: ansible_os_family == "Debian" -- include: redhat/pkg.yml +- include_tasks: redhat/pkg.yml tags: monit_pkg when: ansible_os_family == "RedHat" -- include: config.yml +- include_tasks: config.yml tags: monit_config -- include: monitors.yml +- include_tasks: monitors.yml tags: monit_monitors -- include: service.yml +- include_tasks: service.yml tags: monit_service