From 4863396938c7c638517cbefc3a2773c9eb29bc69 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Tue, 24 Jan 2023 18:03:15 +0100 Subject: Split to OS specific common pillar Signed-off-by: Georg Pfuetzenreuter --- pillar/common.sls | 12 ------------ pillar/common/init.sls | 8 ++++++++ pillar/common/suse.sls | 3 +++ 3 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 pillar/common.sls create mode 100644 pillar/common/init.sls create mode 100644 pillar/common/suse.sls diff --git a/pillar/common.sls b/pillar/common.sls deleted file mode 100644 index d423f73..0000000 --- a/pillar/common.sls +++ /dev/null @@ -1,12 +0,0 @@ -include: - - role.salt.common - - role.salt.minion - -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/init.sls b/pillar/common/init.sls new file mode 100644 index 0000000..7665aa6 --- /dev/null +++ b/pillar/common/init.sls @@ -0,0 +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 diff --git a/pillar/common/suse.sls b/pillar/common/suse.sls new file mode 100644 index 0000000..4105c37 --- /dev/null +++ b/pillar/common/suse.sls @@ -0,0 +1,3 @@ +zypper: + refreshdb_force: False + -- cgit v1.2.3 From 6c7aaa08e160703ee89a93847b2f46879df99912 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Tue, 24 Jan 2023 20:35:14 +0100 Subject: Manage common Postfix Add configuration for global client MTA's. Signed-off-by: Georg Pfuetzenreuter Enable Postfix management Signed-off-by: Georg Pfuetzenreuter --- pillar/common/postfix.sls | 19 +++++++++++++++++++ pillar/common/suse.sls | 3 +++ salt/common/postfix.sls | 3 +++ salt/common/suse.sls | 1 + 4 files changed, 26 insertions(+) create mode 100644 pillar/common/postfix.sls create mode 100644 salt/common/postfix.sls diff --git a/pillar/common/postfix.sls b/pillar/common/postfix.sls new file mode 100644 index 0000000..ce59e60 --- /dev/null +++ b/pillar/common/postfix.sls @@ -0,0 +1,19 @@ +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' + + diff --git a/pillar/common/suse.sls b/pillar/common/suse.sls index 4105c37..f3456ed 100644 --- a/pillar/common/suse.sls +++ b/pillar/common/suse.sls @@ -1,3 +1,6 @@ +include: + - .postfix + zypper: refreshdb_force: False diff --git a/salt/common/postfix.sls b/salt/common/postfix.sls new file mode 100644 index 0000000..d5b51d4 --- /dev/null +++ b/salt/common/postfix.sls @@ -0,0 +1,3 @@ +include: + - postfix + - postfix.config diff --git a/salt/common/suse.sls b/salt/common/suse.sls index e655353..d76da87 100644 --- a/salt/common/suse.sls +++ b/salt/common/suse.sls @@ -3,6 +3,7 @@ include: - profile.zypp - profile.node_exporter - users + - .postfix {#- to-do: move this to some formula or macro -#} {%- set osfullname = grains['osfullname'] -%} -- cgit v1.2.3 From 5f9a74c612c32f136f42fee71ca2ab3dd5ca7b42 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Tue, 24 Jan 2023 20:37:11 +0100 Subject: Enable postfix-formula Signed-off-by: Georg Pfuetzenreuter --- bin/prepare_minion.py | 1 + pillar/role/salt/master.sls | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/prepare_minion.py b/bin/prepare_minion.py index 7bddba1..a1f15bd 100755 --- a/bin/prepare_minion.py +++ b/bin/prepare_minion.py @@ -28,6 +28,7 @@ file_roots: - /srv/salt - /srv/formulas/salt-formula - /srv/formulas/users-formula + - /srv/formulas/postfix-formula ''') os.symlink(mypwd + '/salt', '/srv/salt') 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'} -- cgit v1.2.3 From 70036d224feb0cc73c61982aa284f77c9ad68904 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Tue, 24 Jan 2023 21:13:58 +0100 Subject: Manage aliases Signed-off-by: Georg Pfuetzenreuter --- pillar/common/postfix.sls | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pillar/common/postfix.sls b/pillar/common/postfix.sls index ce59e60..15c3d07 100644 --- a/pillar/common/postfix.sls +++ b/pillar/common/postfix.sls @@ -16,4 +16,11 @@ postfix: 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