From 8a20ec5ca27851d80b381c8b4793360bf4a15e27 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 30 Dec 2016 10:40:18 +0100
Subject: [PATCH] evolinux_base/postfix: add some variables

* myhostname
* mydestination
* myorigin
---
 evolinux-base/README.md         | 3 +++
 evolinux-base/defaults/main.yml | 2 ++
 evolinux-base/tasks/postfix.yml | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/evolinux-base/README.md b/evolinux-base/README.md
index 3e3d1f7c..4ee52e26 100644
--- a/evolinux-base/README.md
+++ b/evolinux-base/README.md
@@ -25,6 +25,9 @@ Main variables are :
 * `evolinux_additional_packages`: optional additional packages to install (default: `[]`)
 * `evolinux_postfix_slow_transports_enabled`: configure slow transports (default: `True`) ;
 * `evolinux_postfix_remove_exim`: remove Exim4 packages (default: `True`) ;
+* `evolinux_postfix_myorigin`: `myorigin` variable for Postfix (default: value of `ansible_fqdn`) ;
+* `evolinux_postfix_myhostname`: `myhostname` variable for Postfix (default: value of `ansible_fqdn`) ;
+* `evolinux_postfix_mydestination`: `mydestination` variable for Postfix (default: `$myhostname`) ;
 * `evolinux_ssh_password_auth_addresses`: list of addresses that can authenticate with a password (default: `[]`)
 * `evolinux_ssh_disable_root`: disable SSH access for root (default: `True`)
 
diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index 6a6adbcb..f784dc03 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -22,6 +22,8 @@ evolinux_apt_remove_aptitude: True
 # postfix
 
 evolinux_postfix_myorigin: "{{ ansible_fqdn }}"
+evolinux_postfix_myhostname: "{{ ansible_fqdn }}"
+evolinux_postfix_mydestination: "$myhostname"
 evolinux_postfix_slow_transports_enabled: True
 evolinux_postfix_remove_exim: True
 
diff --git a/evolinux-base/tasks/postfix.yml b/evolinux-base/tasks/postfix.yml
index df13c338..2f82c032 100644
--- a/evolinux-base/tasks/postfix.yml
+++ b/evolinux-base/tasks/postfix.yml
@@ -18,6 +18,8 @@
     line: "{{ item.key }} = {{ item.value }}"
   with_items:
     - { key: "myorigin", value: "{{ evolinux_postfix_myorigin }}" }
+    - { key: "myhostname", value: "{{ evolinux_postfix_myhostname }}" }
+    - { key: "mydestination", value: "{{ evolinux_postfix_mydestination }}" }
     - { key: "disable_vrfy_command", value: "yes" }
   notify: reload postfix
   tags: