Merge pull request 'Revert OS pillar split' (#4) from revert-ospillarsplit into production

Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/4

3 files changed, 0 insertions, 40 deletions

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
-