diff --git a/roles/opensmtpd/handlers/main.yml b/roles/opensmtpd/handlers/main.yml index 50a5ec0..0bff6f3 100644 --- a/roles/opensmtpd/handlers/main.yml +++ b/roles/opensmtpd/handlers/main.yml @@ -1,5 +1,5 @@ --- - name: restart opensmtpd service: - name: "{{ opensmtpd_service }}" + name: smtpd state: restarted diff --git a/roles/opensmtpd/tasks/main.yml b/roles/opensmtpd/tasks/main.yml index d2928ad..d80745e 100644 --- a/roles/opensmtpd/tasks/main.yml +++ b/roles/opensmtpd/tasks/main.yml @@ -1,25 +1,13 @@ --- -- name: include OS-specific variables - include_vars: "{{ item }}" - with_first_found: - - "{{ ansible_os_family }}.yml" - - default.yml - -- block: - - name: install opensmtpd - package: - name: opensmtpd - state: installed - - name: set default mta to opensmtpd - alternatives: - name: mta - path: /usr/sbin/sendmail.opensmtpd - when: opensmtpd_package is defined +- name: check support + fail: + msg: Role not supported in your system + when: ansible_os_family != "OpenBSD" - name: create smtpd.conf from template template: src: smtpd.conf.j2 - dest: "{{ opensmtpd_config }}" + dest: /etc/mail/smtpd.conf mode: 0644 owner: root group: "{{ ansible_wheel }}" @@ -28,7 +16,7 @@ - name: force server name to domain name copy: content: "{{ mail_domain }}\n" - dest: "{{ opensmtpd_confdir }}/mailname" + dest: /etc/mail//mailname mode: 0644 owner: root group: "{{ ansible_wheel }}" @@ -36,6 +24,6 @@ - name: enable opensmtpd service: - name: "{{ opensmtpd_service }}" + name: smtpd state: started enabled: true diff --git a/roles/opensmtpd/templates/smtpd.conf.j2 b/roles/opensmtpd/templates/smtpd.conf.j2 index 22f136c..f959a62 100644 --- a/roles/opensmtpd/templates/smtpd.conf.j2 +++ b/roles/opensmtpd/templates/smtpd.conf.j2 @@ -1,17 +1,9 @@ -{% if ansible_lo0 is defined %} listen on lo0 -{% else %} -listen on lo -{% endif %} -table aliases file:{{ opensmtpd_aliases }} +table aliases file:/etc/mail/aliases # use obsolete smtps as it goes through firewalls better than 25 -{% if ansible_os_family in ["OpenBSD"] %} action "local" mbox alias action "relay" relay host smtps://{{ mail_server }} mail-from "@{{ mail_domain }}" match for local action "local" match for any action "relay" -{% else %} -accept from local for any relay via smtps://mail.foo.sh as "@foo.sh" -{% endif %} diff --git a/roles/opensmtpd/vars/OpenBSD.yml b/roles/opensmtpd/vars/OpenBSD.yml deleted file mode 100644 index 1fd909f..0000000 --- a/roles/opensmtpd/vars/OpenBSD.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -opensmtpd_confdir: /etc/mail -opensmtpd_config: "{{ opensmtpd_confdir }}/smtpd.conf" -opensmtpd_service: smtpd -opensmtpd_aliases: /etc/mail/aliases diff --git a/roles/opensmtpd/vars/default.yml b/roles/opensmtpd/vars/default.yml deleted file mode 100644 index 829e328..0000000 --- a/roles/opensmtpd/vars/default.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -opensmtpd_confdir: /etc/opensmtpd -opensmtpd_config: "{{ opensmtpd_confdir }}/opensmtpd.conf" -opensmtpd_package: opensmtpd -opensmtpd_service: opensmtpd -opensmtpd_aliases: /etc/aliases