From f949c0aba0bd9863474a35e1613eb23554acc449 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Thu, 26 Jan 2023 19:34:01 +0100 Subject: mta.postfix->global.mta pillar; remove mta profile This is more a MTA configuration for system email on all hosts instead of a dedicated email server role. Signed-off-by: Georg Pfuetzenreuter --- pillar/global/init.sls | 2 +- pillar/global/mta.sls | 28 ++++++++++++++++++++++++++++ pillar/role/mta/postfix.sls | 28 ---------------------------- 3 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 pillar/global/mta.sls delete mode 100644 pillar/role/mta/postfix.sls (limited to 'pillar') diff --git a/pillar/global/init.sls b/pillar/global/init.sls index 280886f..98536a3 100644 --- a/pillar/global/init.sls +++ b/pillar/global/init.sls @@ -1,7 +1,7 @@ include: - role.salt.common - role.salt.minion - - role.mta.postfix + - .mta managed_header_pound: | ### This file is managed via https://git.com.de/LibertaCasa/salt diff --git a/pillar/global/mta.sls b/pillar/global/mta.sls new file mode 100644 index 0000000..a992440 --- /dev/null +++ b/pillar/global/mta.sls @@ -0,0 +1,28 @@ +postfix: + master_config: + services: + smtp: + enable: False + config: + # to-do: set via site config + relayhost: zz0.email:465 + mydestination: '$myhostname, localhost' + myhostname: {{ grains['fqdn'] }} + inet_interfaces: loopback-only + # to-do: support relay via IPv6 + inet_protocols: ipv4 + alias_database: lmdb:/etc/aliases + alias_maps: lmdb:/etc/aliases + smtpd_use_tls: 'no' + smtp_use_tls: 'yes' + smtp_tls_security_level: encrypt + smtp_tls_wrappermode: 'yes' + + aliases: + use_file: false + present: + admins: 'georg, pratyush' + georg: georg@lysergic.dev + pratyush: pratyush@lysergic.dev + root: 'system, \root' + system: system@lysergic.dev diff --git a/pillar/role/mta/postfix.sls b/pillar/role/mta/postfix.sls deleted file mode 100644 index a992440..0000000 --- a/pillar/role/mta/postfix.sls +++ /dev/null @@ -1,28 +0,0 @@ -postfix: - master_config: - services: - smtp: - enable: False - config: - # to-do: set via site config - relayhost: zz0.email:465 - mydestination: '$myhostname, localhost' - myhostname: {{ grains['fqdn'] }} - inet_interfaces: loopback-only - # to-do: support relay via IPv6 - inet_protocols: ipv4 - alias_database: lmdb:/etc/aliases - alias_maps: lmdb:/etc/aliases - smtpd_use_tls: 'no' - smtp_use_tls: 'yes' - smtp_tls_security_level: encrypt - smtp_tls_wrappermode: 'yes' - - aliases: - use_file: false - present: - admins: 'georg, pratyush' - georg: georg@lysergic.dev - pratyush: pratyush@lysergic.dev - root: 'system, \root' - system: system@lysergic.dev -- cgit v1.2.3