From 1b6700925c4690e026b6873e6e2358de86ccf706 Mon Sep 17 00:00:00 2001 From: William Hirigoyen Date: Thu, 31 Aug 2023 17:47:58 +0200 Subject: [PATCH] Revert "postfix: Replace ansible_fqdn by evolinux_fqdn, set postfix_slow_transport_include to false by default (only for packmails and packwebs)" This reverts commit bfe3bd7ef4edd65002b98d0b3623425e52e1b85f. --- postfix/defaults/main.yml | 4 ++-- postfix/templates/packmail_main.cf.j2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/postfix/defaults/main.yml b/postfix/defaults/main.yml index 8bd15a86..55ab72cd 100644 --- a/postfix/defaults/main.yml +++ b/postfix/defaults/main.yml @@ -1,5 +1,5 @@ --- -postfix_hostname: "{{ evolinux_fqdn }}" +postfix_hostname: "{{ ansible_fqdn }}" postfix_force_main_cf: False postfix_packmail: False -postfix_slow_transport_include: False +postfix_slow_transport_include: "{{ postfix_packmail }}" diff --git a/postfix/templates/packmail_main.cf.j2 b/postfix/templates/packmail_main.cf.j2 index 30848c8c..0d80cf00 100644 --- a/postfix/templates/packmail_main.cf.j2 +++ b/postfix/templates/packmail_main.cf.j2 @@ -66,7 +66,7 @@ smtpd_banner = $myhostname ESMTP mail server # Indique le nom d'hote pleinement qualifie ou se trouve postfix [OBLIGATOIRE] #par defaut, = [retour de la commande Unix hostname] -myhostname = {{ postfix_hostname }} +myhostname = {{ ansible_fqdn }} # Variable indiquant le domaine dans lequel se trouve la machine #par defaut, = [partie domain de la variable $myhostname]