summaryrefslogtreecommitdiffstats
path: root/pillar/common
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-01-24 23:03:20 +0100
committerGeorg Pfuetzenreuter2023-01-24 23:03:20 +0100
commit7b9f184c6b0e6164cfc08b5ae4b77970cc001194 (patch)
tree0fa58b0f02166f66be58d368f9acafcc84207b4c /pillar/common
parent342affc1b8d8a3c6152de27e809a63e6cc86b043 (diff)
downloadsalt-7b9f184c6b0e6164cfc08b5ae4b77970cc001194.tar.gz
salt-7b9f184c6b0e6164cfc08b5ae4b77970cc001194.tar.bz2
salt-7b9f184c6b0e6164cfc08b5ae4b77970cc001194.zip
Revert "Split to OS specific common pillar"
This reverts commit 4863396938c7c638517cbefc3a2773c9eb29bc69.
Diffstat (limited to 'pillar/common')
-rw-r--r--pillar/common/init.sls8
-rw-r--r--pillar/common/postfix.sls26
-rw-r--r--pillar/common/suse.sls6
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
-