diff --git a/group_vars/all/nullmailer.yml b/group_vars/all/nullmailer.yml new file mode 100644 index 0000000000000000000000000000000000000000..5c63dbc4ec369e8829681169fc40e20044f39d78 --- /dev/null +++ b/group_vars/all/nullmailer.yml @@ -0,0 +1,5 @@ +--- +glob_nullmailer: + root: root@crans.org + smtp_server: smtp.adm.crans.org + defaulthost: crans.org diff --git a/plays/mail.yml b/plays/mail.yml index 536a2b6866fb3a4cfb4b639d6c21b6377fe56b1a..38e1b29808788d37e1c113d0ee127b5616cb783d 100755 --- a/plays/mail.yml +++ b/plays/mail.yml @@ -1,14 +1,7 @@ #!/usr/bin/env ansible-playbook --- -# Redisdead is the main MX. -# Soyouz and titanic are the old backup MX. -# Boeing and sputnik are the new MX (still in installation ?). -# All other servers uses nullmailer to send local mail to Crans SMTP. - -# Redirect local mail to mailserver - hosts: crans_server,!postfix vars: - mail_root: root@crans.org - mail_smtp_server: smtp.adm.crans.org - mail_defaulthost: crans.org - roles: ["nullmailer"] + nullmailer: "{{ glob_nullmailer | default({}) | combine(loc_nullmailer | default({})) }}" + roles: + - nullmailer diff --git a/roles/nullmailer/tasks/main.yml b/roles/nullmailer/tasks/main.yml index 21d2d875bf7749106beed7dd592a3afe5935d065..2d354bba91a37edfb8e9a327966906360f73e6b8 100644 --- a/roles/nullmailer/tasks/main.yml +++ b/roles/nullmailer/tasks/main.yml @@ -11,18 +11,18 @@ - name: Set nullmailer remotes copy: - content: "{{ mail_smtp_server }} smtp\n" + content: "{{ nullmailer.smtp_server }} smtp\n" dest: /etc/nullmailer/remotes mode: 0644 - name: Set nullmailer adminaddr copy: - content: "{{ mail_root }}\n" + content: "{{ nullmailer.root }}\n" dest: /etc/nullmailer/adminaddr mode: 0644 - name: Set nullmailer defaulthost copy: - content: "{{ mail_defaulthost }}\n" + content: "{{ nullmailer.defaulthost }}\n" dest: /etc/nullmailer/defaulthost mode: 0644