From b24b7cb938fa5fb071097f2dafe18a79d18bd8b9 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 14 Dec 2015 22:03:57 +0200
Subject: [PATCH] Adjust root mail alias to function on both Debian and
OpenBSD, updated the TODO list accordingly.
---
README.rst | 1 -
tasks/mail_forward.yml | 7 ++++++-
vars/main.yml | 3 +++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/README.rst b/README.rst
index 02a8b53..8890449 100644
--- a/README.rst
+++ b/README.rst
@@ -89,7 +89,6 @@ TODO
- collectd_agent.
- init (via module).
- ldap_login (with pam_mkhomedir).
- - mail_forward (OpenBSD support?).
- ssh_ca.
- syslog_forwarding.
- Test.
diff --git a/tasks/mail_forward.yml b/tasks/mail_forward.yml
index 16910f3..68e20cd 100644
--- a/tasks/mail_forward.yml
+++ b/tasks/mail_forward.yml
@@ -14,6 +14,11 @@
- name: Set root mail alias
lineinfile:
- dest: '/etc/aliases'
+ dest: '{{ aliases_file[ansible_os_family] }}'
line: 'root: {{ mail_root_alias }}'
regexp: '^root:'
+ register: root_alias
+
+- name: Update SMTPd database
+ when: ansible_os_family == 'OpenBSD' and root_alias.changed
+ command: /usr/sbin/makemap /etc/mail/aliases
diff --git a/vars/main.yml b/vars/main.yml
index 730915d..427472d 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -53,3 +53,6 @@ ntp_pool:
ntpd_service:
OpenBSD: ntpd
Debian: ntp
+aliases_file:
+ OpenBSD: /etc/mail/aliases
+ Debian: /etc/aliases
--
GitLab