From 999026a8bcf809438fbb5c2a87e8aa7d6782533a Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Sun, 30 Oct 2022 16:04:41 +0000 Subject: [PATCH] opensmtpd: ansible-lint fixes --- roles/opensmtpd/handlers/main.yml | 4 ++-- roles/opensmtpd/tasks/main.yml | 17 ++++++----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/roles/opensmtpd/handlers/main.yml b/roles/opensmtpd/handlers/main.yml index 0bff6f3..0801fad 100644 --- a/roles/opensmtpd/handlers/main.yml +++ b/roles/opensmtpd/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: restart opensmtpd - service: +- name: Restart opensmtpd + ansible.builtin.service: name: smtpd state: restarted diff --git a/roles/opensmtpd/tasks/main.yml b/roles/opensmtpd/tasks/main.yml index d80745e..61a073c 100644 --- a/roles/opensmtpd/tasks/main.yml +++ b/roles/opensmtpd/tasks/main.yml @@ -1,11 +1,6 @@ --- -- name: check support - fail: - msg: Role not supported in your system - when: ansible_os_family != "OpenBSD" - -- name: create smtpd.conf from template - template: +- name: Create smtpd.conf from template + ansible.builtin.template: src: smtpd.conf.j2 dest: /etc/mail/smtpd.conf mode: 0644 @@ -13,8 +8,8 @@ group: "{{ ansible_wheel }}" notify: restart opensmtpd -- name: force server name to domain name - copy: +- name: Force server name to domain name + ansible.builtin.copy: content: "{{ mail_domain }}\n" dest: /etc/mail//mailname mode: 0644 @@ -22,8 +17,8 @@ group: "{{ ansible_wheel }}" notify: restart opensmtpd -- name: enable opensmtpd - service: +- name: Enable opensmtpd + ansible.builtin.service: name: smtpd state: started enabled: true