From 7b9f184c6b0e6164cfc08b5ae4b77970cc001194 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Tue, 24 Jan 2023 23:03:20 +0100 Subject: Revert "Split to OS specific common pillar" This reverts commit 4863396938c7c638517cbefc3a2773c9eb29bc69. --- pillar/common/init.sls | 8 -------- pillar/common/postfix.sls | 26 -------------------------- pillar/common/suse.sls | 6 ------ 3 files changed, 40 deletions(-) delete mode 100644 pillar/common/init.sls delete mode 100644 pillar/common/postfix.sls delete mode 100644 pillar/common/suse.sls (limited to 'pillar/common') diff --git a/pillar/common/init.sls b/pillar/common/init.sls deleted file mode 100644 index 7665aa6..0000000 --- a/pillar/common/init.sls +++ /dev/null @@ -1,8 +0,0 @@ -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/postfix.sls b/pillar/common/postfix.sls deleted file mode 100644 index 15c3d07..0000000 --- a/pillar/common/postfix.sls +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index f3456ed..0000000 --- a/pillar/common/suse.sls +++ /dev/null @@ -1,6 +0,0 @@ -include: - - .postfix - -zypper: - refreshdb_force: False - -- cgit v1.2.3