From 4ad48694d522c9c8ff872c86e07710c70d1178fc Mon Sep 17 00:00:00 2001 From: phil Date: Sun, 14 Jan 2024 10:42:47 +0100 Subject: [PATCH] Make Mail-TLS-Helper optional --- README.md | 3 ++- tasks/main.yml | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0b0423a..6ae7ff3 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ Postfix Use this role to setup a Postfix mail server. It comes with the following additions: - [Mail-TLS-Helper](https://github.com/systemli/mail-tls-helper) -- [MTA-STS-Resolver](https://github.com/Snawoot/postfix-mta-sts-resolver) - Fail2ban +- optional: [MTA-STS-Resolver](https://github.com/Snawoot/postfix-mta-sts-resolver) - optional: [OnionMX](https://github.com/ehloonion/onionmx) - optional: Unbound @@ -28,6 +28,7 @@ You can select via the variable `postfix_type` a pre-defined set of configuraion |--|--|--|--| | `unbound_install` | bool | | `True` if you whish to install unbound | | `postfix_onionmx` | bool | | `True` to setup OnionMX delivery | +| `postfix_tls_herlp` | bool | `True` to setup Mail-TLS-Helper | | `postfix_mydestination` | List | | List with hostnames | | `postfix_mynetworks` | List | | List with network addresses | diff --git a/tasks/main.yml b/tasks/main.yml index 036f296..c1b2615 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -23,7 +23,9 @@ - name: TLS-helper ansible.builtin.import_tasks: tls-helper.yml tags: tls-helper - when: postfix_type == "internet" + when: + - postfix_type == "internet" + - postfix_tls_helper is defined and postfix_tls_helper - name: MTA-STS ansible.builtin.include_tasks: mta-sts.yml