Manage global Postfix'es + make common pillar OS based #2

Merged
Georg merged 4 commits from postfix into production 2023-01-24 21:26:04 +01:00
7 changed files with 39 additions and 6 deletions

View File

@ -28,6 +28,7 @@ file_roots:
- /srv/salt - /srv/salt
- /srv/formulas/salt-formula - /srv/formulas/salt-formula
- /srv/formulas/users-formula - /srv/formulas/users-formula
- /srv/formulas/postfix-formula
''') ''')
os.symlink(mypwd + '/salt', '/srv/salt') os.symlink(mypwd + '/salt', '/srv/salt')

View File

@ -1,12 +1,8 @@
include: include:
- role.salt.common - role.salt.common
- role.salt.minion - role.salt.minion
- common.{{ grains['os'] | lower }}
managed_header_pound: | managed_header_pound: |
### This file is managed via https://git.com.de/LibertaCasa/salt ### This file is managed via https://git.com.de/LibertaCasa/salt
### Manual changes will be overwritten ### Manual changes will be overwritten
{%- if grains['os'] == 'SUSE' %}
zypper:
refreshdb_force: False
{%- endif %}

26
pillar/common/postfix.sls Normal file
View File

@ -0,0 +1,26 @@
postfix:
master_config:
services:
smtp:
enable: False
config:
# to-do: set via site config
relayhost: zz0.email
myhostname: {{ grains['fqdn'] }}
inet_interfaces: loopback-only
# to-do: support relay via IPv6
inet_protocols: ipv4
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

6
pillar/common/suse.sls Normal file
View File

@ -0,0 +1,6 @@
include:
- .postfix
zypper:
refreshdb_force: False

View File

@ -1,4 +1,4 @@
{%- set formulas = ['salt', 'users'] -%} {%- set formulas = ['salt', 'users', 'postfix'] -%}
salt: salt:
interface: ${'secret_salt:master:interface'} interface: ${'secret_salt:master:interface'}

3
salt/common/postfix.sls Normal file
View File

@ -0,0 +1,3 @@
include:
- postfix
- postfix.config

View File

@ -3,6 +3,7 @@ include:
- profile.zypp - profile.zypp
- profile.node_exporter - profile.node_exporter
- users - users
- .postfix
{#- to-do: move this to some formula or macro -#} {#- to-do: move this to some formula or macro -#}
{%- set osfullname = grains['osfullname'] -%} {%- set osfullname = grains['osfullname'] -%}