diff options
Diffstat (limited to 'pillar')
-rw-r--r-- | pillar/common/init.sls (renamed from pillar/common.sls) | 6 | ||||
-rw-r--r-- | pillar/common/postfix.sls | 26 | ||||
-rw-r--r-- | pillar/common/suse.sls | 6 | ||||
-rw-r--r-- | pillar/role/salt/master.sls | 2 |
4 files changed, 34 insertions, 6 deletions
diff --git a/pillar/common.sls b/pillar/common/init.sls index d423f73..7665aa6 100644 --- a/pillar/common.sls +++ b/pillar/common/init.sls @@ -1,12 +1,8 @@ include: - role.salt.common - role.salt.minion + - common.{{ grains['os'] | lower }} managed_header_pound: | ### This file is managed via https://git.com.de/LibertaCasa/salt ### Manual changes will be overwritten - -{%- if grains['os'] == 'SUSE' %} -zypper: - refreshdb_force: False -{%- endif %} diff --git a/pillar/common/postfix.sls b/pillar/common/postfix.sls new file mode 100644 index 0000000..15c3d07 --- /dev/null +++ b/pillar/common/postfix.sls @@ -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 diff --git a/pillar/common/suse.sls b/pillar/common/suse.sls new file mode 100644 index 0000000..f3456ed --- /dev/null +++ b/pillar/common/suse.sls @@ -0,0 +1,6 @@ +include: + - .postfix + +zypper: + refreshdb_force: False + diff --git a/pillar/role/salt/master.sls b/pillar/role/salt/master.sls index b306637..cafd05d 100644 --- a/pillar/role/salt/master.sls +++ b/pillar/role/salt/master.sls @@ -1,4 +1,4 @@ -{%- set formulas = ['salt', 'users'] -%} +{%- set formulas = ['salt', 'users', 'postfix'] -%} salt: interface: ${'secret_salt:master:interface'} |